Module Name: src
Committed By: nonaka
Date: Tue Jun 21 11:37:25 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
add sdhc(4) at acpi to i386 and amd64 GENERIC kernel config.
To generate a diff of this commit:
cvs rdiff -u -r1.434 -r1.435 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1136 -r1.1137 src/sys/arch/i386/conf/GENERIC
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.434 src/sys/arch/amd64/conf/GENERIC:1.435
--- src/sys/arch/amd64/conf/GENERIC:1.434 Tue Jun 14 03:34:01 2016
+++ src/sys/arch/amd64/conf/GENERIC Tue Jun 21 11:37:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.434 2016/06/14 03:34:01 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.435 2016/06/21 11:37:25 nonaka Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.434 $"
+#ident "GENERIC-$Revision: 1.435 $"
maxusers 64 # estimated number of users
@@ -319,6 +319,7 @@ joy* at acpi? # Joystick/Game port
mpu* at acpi? # Roland MPU-401 MIDI UART
pckbc* at acpi? # PC keyboard controller
pcppi* at acpi? # AT-style speaker sound
+sdhc* at acpi? # SD Host Controller
sony* at acpi? # Sony Notebook Controller
spic* at acpi? # Sony Programmable I/O Controller
wsmouse* at spic? # mouse
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1136 src/sys/arch/i386/conf/GENERIC:1.1137
--- src/sys/arch/i386/conf/GENERIC:1.1136 Fri May 20 01:37:47 2016
+++ src/sys/arch/i386/conf/GENERIC Tue Jun 21 11:37:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1136 2016/05/20 01:37:47 christos Exp $
+# $NetBSD: GENERIC,v 1.1137 2016/06/21 11:37:25 nonaka Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1136 $"
+#ident "GENERIC-$Revision: 1.1137 $"
maxusers 64 # estimated number of users
@@ -369,6 +369,7 @@ joy* at acpi? # Joystick/Game port
mpu* at acpi? # Roland MPU-401 MIDI UART
pckbc* at acpi? # PC keyboard controller
pcppi* at acpi? # AT-style speaker sound
+sdhc* at acpi? # SD Host Controller
sony* at acpi? # Sony Miscellaneous Controller
thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
#tpm* at acpi? # ACPI TPM (Experimental)
