aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-12-09 15:33:35 -0500
committerAndi Kleen <andi@basil.nowhere.org>2006-12-09 15:33:35 -0500
commite0f27981f2d5fd93b2795e8348327b081c512f83 (patch)
treedd435a9390b3b1185656c37d42156db804a5d9bc
parent9f25441fe6a4d8fc080a1f814078ac5d67adeea4 (diff)
[PATCH] i386: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--arch/i386/defconfig28
1 files changed, 21 insertions, 7 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 65891f11aced..3265208e5899 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-git7 3# Linux kernel version: 2.6.19-git14
4# Wed Dec 6 23:50:49 2006 4# Sat Dec 9 21:23:14 2006
5# 5#
6CONFIG_X86_32=y 6CONFIG_X86_32=y
7CONFIG_GENERIC_TIME=y 7CONFIG_GENERIC_TIME=y
@@ -12,6 +12,7 @@ CONFIG_X86=y
12CONFIG_MMU=y 12CONFIG_MMU=y
13CONFIG_GENERIC_ISA_DMA=y 13CONFIG_GENERIC_ISA_DMA=y
14CONFIG_GENERIC_IOMAP=y 14CONFIG_GENERIC_IOMAP=y
15CONFIG_GENERIC_BUG=y
15CONFIG_GENERIC_HWEIGHT=y 16CONFIG_GENERIC_HWEIGHT=y
16CONFIG_ARCH_MAY_HAVE_PC_FDC=y 17CONFIG_ARCH_MAY_HAVE_PC_FDC=y
17CONFIG_DMI=y 18CONFIG_DMI=y
@@ -141,6 +142,8 @@ CONFIG_X86_CMPXCHG=y
141CONFIG_X86_XADD=y 142CONFIG_X86_XADD=y
142CONFIG_X86_L1_CACHE_SHIFT=7 143CONFIG_X86_L1_CACHE_SHIFT=7
143CONFIG_RWSEM_XCHGADD_ALGORITHM=y 144CONFIG_RWSEM_XCHGADD_ALGORITHM=y
145# CONFIG_ARCH_HAS_ILOG2_U32 is not set
146# CONFIG_ARCH_HAS_ILOG2_U64 is not set
144CONFIG_GENERIC_CALIBRATE_DELAY=y 147CONFIG_GENERIC_CALIBRATE_DELAY=y
145CONFIG_X86_WP_WORKS_OK=y 148CONFIG_X86_WP_WORKS_OK=y
146CONFIG_X86_INVLPG=y 149CONFIG_X86_INVLPG=y
@@ -203,6 +206,7 @@ CONFIG_MTRR=y
203CONFIG_SECCOMP=y 206CONFIG_SECCOMP=y
204# CONFIG_HZ_100 is not set 207# CONFIG_HZ_100 is not set
205CONFIG_HZ_250=y 208CONFIG_HZ_250=y
209# CONFIG_HZ_300 is not set
206# CONFIG_HZ_1000 is not set 210# CONFIG_HZ_1000 is not set
207CONFIG_HZ=250 211CONFIG_HZ=250
208# CONFIG_KEXEC is not set 212# CONFIG_KEXEC is not set
@@ -563,6 +567,7 @@ CONFIG_IDEDMA_AUTO=y
563# 567#
564# CONFIG_RAID_ATTRS is not set 568# CONFIG_RAID_ATTRS is not set
565CONFIG_SCSI=y 569CONFIG_SCSI=y
570# CONFIG_SCSI_TGT is not set
566CONFIG_SCSI_NETLINK=y 571CONFIG_SCSI_NETLINK=y
567# CONFIG_SCSI_PROC_FS is not set 572# CONFIG_SCSI_PROC_FS is not set
568 573
@@ -583,6 +588,7 @@ CONFIG_CHR_DEV_SG=y
583# CONFIG_SCSI_MULTI_LUN is not set 588# CONFIG_SCSI_MULTI_LUN is not set
584# CONFIG_SCSI_CONSTANTS is not set 589# CONFIG_SCSI_CONSTANTS is not set
585# CONFIG_SCSI_LOGGING is not set 590# CONFIG_SCSI_LOGGING is not set
591# CONFIG_SCSI_SCAN_ASYNC is not set
586 592
587# 593#
588# SCSI Transports 594# SCSI Transports
@@ -642,6 +648,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0
642# CONFIG_SCSI_DC390T is not set 648# CONFIG_SCSI_DC390T is not set
643# CONFIG_SCSI_NSP32 is not set 649# CONFIG_SCSI_NSP32 is not set
644# CONFIG_SCSI_DEBUG is not set 650# CONFIG_SCSI_DEBUG is not set
651# CONFIG_SCSI_SRP is not set
645 652
646# 653#
647# Serial ATA (prod) and Parallel ATA (experimental) drivers 654# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -1082,10 +1089,7 @@ CONFIG_SOUND=y
1082# Open Sound System 1089# Open Sound System
1083# 1090#
1084CONFIG_SOUND_PRIME=y 1091CONFIG_SOUND_PRIME=y
1085CONFIG_OSS_OBSOLETE_DRIVER=y
1086# CONFIG_SOUND_BT878 is not set 1092# CONFIG_SOUND_BT878 is not set
1087# CONFIG_SOUND_EMU10K1 is not set
1088# CONFIG_SOUND_FUSION is not set
1089# CONFIG_SOUND_ES1371 is not set 1093# CONFIG_SOUND_ES1371 is not set
1090CONFIG_SOUND_ICH=y 1094CONFIG_SOUND_ICH=y
1091# CONFIG_SOUND_TRIDENT is not set 1095# CONFIG_SOUND_TRIDENT is not set
@@ -1095,6 +1099,11 @@ CONFIG_SOUND_ICH=y
1095# CONFIG_SOUND_OSS is not set 1099# CONFIG_SOUND_OSS is not set
1096 1100
1097# 1101#
1102# HID Devices
1103#
1104CONFIG_HID=y
1105
1106#
1098# USB support 1107# USB support
1099# 1108#
1100CONFIG_USB_ARCH_HAS_HCD=y 1109CONFIG_USB_ARCH_HAS_HCD=y
@@ -1158,8 +1167,7 @@ CONFIG_USB_STORAGE=y
1158# USB Input Devices 1167# USB Input Devices
1159# 1168#
1160CONFIG_USB_HID=y 1169CONFIG_USB_HID=y
1161CONFIG_USB_HIDINPUT=y 1170# CONFIG_USB_HID_POWERBOOK is not set
1162# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1163# CONFIG_HID_FF is not set 1171# CONFIG_HID_FF is not set
1164# CONFIG_USB_HIDDEV is not set 1172# CONFIG_USB_HIDDEV is not set
1165# CONFIG_USB_AIPTEK is not set 1173# CONFIG_USB_AIPTEK is not set
@@ -1444,6 +1452,11 @@ CONFIG_NLS_ISO8859_15=y
1444CONFIG_NLS_UTF8=y 1452CONFIG_NLS_UTF8=y
1445 1453
1446# 1454#
1455# Distributed Lock Manager
1456#
1457# CONFIG_DLM is not set
1458
1459#
1447# Instrumentation Support 1460# Instrumentation Support
1448# 1461#
1449CONFIG_PROFILING=y 1462CONFIG_PROFILING=y
@@ -1509,6 +1522,7 @@ CONFIG_DOUBLEFAULT=y
1509# 1522#
1510# Library routines 1523# Library routines
1511# 1524#
1525CONFIG_BITREVERSE=y
1512# CONFIG_CRC_CCITT is not set 1526# CONFIG_CRC_CCITT is not set
1513# CONFIG_CRC16 is not set 1527# CONFIG_CRC16 is not set
1514CONFIG_CRC32=y 1528CONFIG_CRC32=y