aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-15 01:46:28 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-03-15 01:46:28 -0800
commit9038672ad96899c5c334cf4dc192483ffa671bab (patch)
tree6c16490f3b31dce8f09cff7c6a504bb4a52dfabd
parentf33aa21125f96a3decc288079014811a2ee985aa (diff)
downloadhistory-9038672ad96899c5c334cf4dc192483ffa671bab.tar.gz
-rw-r--r--arch/i386/defconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 36badd930386d..e0e4c0b764a2f 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -77,6 +77,11 @@ CONFIG_HAVE_DEC_LOCK=y
#
# General options
#
+
+#
+# ACPI Support
+#
+# CONFIG_ACPI is not set
CONFIG_X86_IO_APIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_PCI=y
@@ -830,6 +835,7 @@ CONFIG_USB_UHCI_ALT=y
# USB Device Class drivers
#
# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_EMI26 is not set
# CONFIG_USB_BLUETOOTH is not set
CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_DEBUG is not set