Module Name: src
Committed By: jakllsch
Date: Sat Nov 6 15:06:29 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
Log Message:
Enable schide(4), Intel SCH IDE controller driver from PR#42310.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.997 -r1.998 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.274 src/sys/arch/i386/conf/ALL:1.275
--- src/sys/arch/i386/conf/ALL:1.274 Fri Nov 5 10:28:21 2010
+++ src/sys/arch/i386/conf/ALL Sat Nov 6 15:06:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.274 2010/11/05 10:28:21 gsutre Exp $
+# $NetBSD: ALL,v 1.275 2010/11/06 15:06:29 jakllsch Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.274 $"
+#ident "ALL-$Revision: 1.275 $"
maxusers 64 # estimated number of users
@@ -904,6 +904,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+schide* at pci? dev ? function ? # Intel SCH IDE controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.997 src/sys/arch/i386/conf/GENERIC:1.998
--- src/sys/arch/i386/conf/GENERIC:1.997 Fri Nov 5 10:28:21 2010
+++ src/sys/arch/i386/conf/GENERIC Sat Nov 6 15:06:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.997 2010/11/05 10:28:21 gsutre Exp $
+# $NetBSD: GENERIC,v 1.998 2010/11/06 15:06:29 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.997 $"
+#ident "GENERIC-$Revision: 1.998 $"
maxusers 64 # estimated number of users
@@ -856,6 +856,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+schide* at pci? dev ? function ? # Intel SCH IDE controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.37 src/sys/arch/i386/conf/XEN3_DOM0:1.38
--- src/sys/arch/i386/conf/XEN3_DOM0:1.37 Thu Aug 12 20:16:27 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Nov 6 15:06:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.37 2010/08/12 20:16:27 haad Exp $
+# $NetBSD: XEN3_DOM0,v 1.38 2010/11/06 15:06:29 jakllsch Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -415,6 +415,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+schide* at pci? dev ? function ? # Intel SCH IDE controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers