diff options
author | Andi Kleen <ak@suse.de> | 2006-10-05 12:47:21 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-10-05 12:47:21 -0400 |
commit | 814eadcefe79a2977a11ba135c4763a402112746 (patch) | |
tree | 133a1f41a82ae07312da95c2f70e98b91c49ae09 | |
parent | a7441a39a3c62addd6ce10497c101057f4d69184 (diff) |
[PATCH] i386: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/i386/defconfig | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index ee2d79bd8af7..60c0c02574f0 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.18-git7 | 3 | # Linux kernel version: 2.6.19-rc1 |
4 | # Wed Sep 27 21:53:10 2006 | 4 | # Thu Oct 5 13:04:53 2006 |
5 | # | 5 | # |
6 | CONFIG_X86_32=y | 6 | CONFIG_X86_32=y |
7 | CONFIG_GENERIC_TIME=y | 7 | CONFIG_GENERIC_TIME=y |
@@ -31,9 +31,11 @@ CONFIG_LOCALVERSION="" | |||
31 | CONFIG_LOCALVERSION_AUTO=y | 31 | CONFIG_LOCALVERSION_AUTO=y |
32 | CONFIG_SWAP=y | 32 | CONFIG_SWAP=y |
33 | CONFIG_SYSVIPC=y | 33 | CONFIG_SYSVIPC=y |
34 | # CONFIG_IPC_NS is not set | ||
34 | CONFIG_POSIX_MQUEUE=y | 35 | CONFIG_POSIX_MQUEUE=y |
35 | # CONFIG_BSD_PROCESS_ACCT is not set | 36 | # CONFIG_BSD_PROCESS_ACCT is not set |
36 | # CONFIG_TASKSTATS is not set | 37 | # CONFIG_TASKSTATS is not set |
38 | # CONFIG_UTS_NS is not set | ||
37 | # CONFIG_AUDIT is not set | 39 | # CONFIG_AUDIT is not set |
38 | CONFIG_IKCONFIG=y | 40 | CONFIG_IKCONFIG=y |
39 | CONFIG_IKCONFIG_PROC=y | 41 | CONFIG_IKCONFIG_PROC=y |
@@ -41,9 +43,10 @@ CONFIG_IKCONFIG_PROC=y | |||
41 | # CONFIG_RELAY is not set | 43 | # CONFIG_RELAY is not set |
42 | CONFIG_INITRAMFS_SOURCE="" | 44 | CONFIG_INITRAMFS_SOURCE="" |
43 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 45 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
46 | CONFIG_SYSCTL=y | ||
44 | # CONFIG_EMBEDDED is not set | 47 | # CONFIG_EMBEDDED is not set |
45 | CONFIG_UID16=y | 48 | CONFIG_UID16=y |
46 | CONFIG_SYSCTL=y | 49 | # CONFIG_SYSCTL_SYSCALL is not set |
47 | CONFIG_KALLSYMS=y | 50 | CONFIG_KALLSYMS=y |
48 | CONFIG_KALLSYMS_ALL=y | 51 | CONFIG_KALLSYMS_ALL=y |
49 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -76,6 +79,7 @@ CONFIG_STOP_MACHINE=y | |||
76 | # | 79 | # |
77 | # Block layer | 80 | # Block layer |
78 | # | 81 | # |
82 | CONFIG_BLOCK=y | ||
79 | CONFIG_LBD=y | 83 | CONFIG_LBD=y |
80 | # CONFIG_BLK_DEV_IO_TRACE is not set | 84 | # CONFIG_BLK_DEV_IO_TRACE is not set |
81 | # CONFIG_LSF is not set | 85 | # CONFIG_LSF is not set |
@@ -163,6 +167,7 @@ CONFIG_VM86=y | |||
163 | # CONFIG_I8K is not set | 167 | # CONFIG_I8K is not set |
164 | # CONFIG_X86_REBOOTFIXUPS is not set | 168 | # CONFIG_X86_REBOOTFIXUPS is not set |
165 | CONFIG_MICROCODE=y | 169 | CONFIG_MICROCODE=y |
170 | CONFIG_MICROCODE_OLD_INTERFACE=y | ||
166 | CONFIG_X86_MSR=y | 171 | CONFIG_X86_MSR=y |
167 | CONFIG_X86_CPUID=y | 172 | CONFIG_X86_CPUID=y |
168 | 173 | ||
@@ -177,6 +182,7 @@ CONFIG_HIGHMEM4G=y | |||
177 | # CONFIG_HIGHMEM64G is not set | 182 | # CONFIG_HIGHMEM64G is not set |
178 | CONFIG_PAGE_OFFSET=0xC0000000 | 183 | CONFIG_PAGE_OFFSET=0xC0000000 |
179 | CONFIG_HIGHMEM=y | 184 | CONFIG_HIGHMEM=y |
185 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
180 | CONFIG_SELECT_MEMORY_MODEL=y | 186 | CONFIG_SELECT_MEMORY_MODEL=y |
181 | CONFIG_FLATMEM_MANUAL=y | 187 | CONFIG_FLATMEM_MANUAL=y |
182 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 188 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -295,6 +301,7 @@ CONFIG_PCI_MMCONFIG=y | |||
295 | CONFIG_PCI_MSI=y | 301 | CONFIG_PCI_MSI=y |
296 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | 302 | # CONFIG_PCI_MULTITHREAD_PROBE is not set |
297 | # CONFIG_PCI_DEBUG is not set | 303 | # CONFIG_PCI_DEBUG is not set |
304 | # CONFIG_HT_IRQ is not set | ||
298 | CONFIG_ISA_DMA_API=y | 305 | CONFIG_ISA_DMA_API=y |
299 | # CONFIG_ISA is not set | 306 | # CONFIG_ISA is not set |
300 | # CONFIG_MCA is not set | 307 | # CONFIG_MCA is not set |
@@ -354,6 +361,7 @@ CONFIG_IP_PNP_DHCP=y | |||
354 | # CONFIG_INET_TUNNEL is not set | 361 | # CONFIG_INET_TUNNEL is not set |
355 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 362 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
356 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 363 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
364 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
357 | CONFIG_INET_DIAG=y | 365 | CONFIG_INET_DIAG=y |
358 | CONFIG_INET_TCP_DIAG=y | 366 | CONFIG_INET_TCP_DIAG=y |
359 | # CONFIG_TCP_CONG_ADVANCED is not set | 367 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -370,6 +378,7 @@ CONFIG_IPV6=y | |||
370 | # CONFIG_INET6_TUNNEL is not set | 378 | # CONFIG_INET6_TUNNEL is not set |
371 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | 379 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
372 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 380 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
381 | # CONFIG_INET6_XFRM_MODE_BEET is not set | ||
373 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 382 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
374 | # CONFIG_IPV6_TUNNEL is not set | 383 | # CONFIG_IPV6_TUNNEL is not set |
375 | # CONFIG_IPV6_SUBTREES is not set | 384 | # CONFIG_IPV6_SUBTREES is not set |
@@ -519,6 +528,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
519 | # CONFIG_BLK_DEV_CS5535 is not set | 528 | # CONFIG_BLK_DEV_CS5535 is not set |
520 | # CONFIG_BLK_DEV_HPT34X is not set | 529 | # CONFIG_BLK_DEV_HPT34X is not set |
521 | # CONFIG_BLK_DEV_HPT366 is not set | 530 | # CONFIG_BLK_DEV_HPT366 is not set |
531 | # CONFIG_BLK_DEV_JMICRON is not set | ||
522 | # CONFIG_BLK_DEV_SC1200 is not set | 532 | # CONFIG_BLK_DEV_SC1200 is not set |
523 | CONFIG_BLK_DEV_PIIX=y | 533 | CONFIG_BLK_DEV_PIIX=y |
524 | # CONFIG_BLK_DEV_IT821X is not set | 534 | # CONFIG_BLK_DEV_IT821X is not set |
@@ -615,6 +625,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0 | |||
615 | # CONFIG_SCSI_IPR is not set | 625 | # CONFIG_SCSI_IPR is not set |
616 | # CONFIG_SCSI_QLOGIC_1280 is not set | 626 | # CONFIG_SCSI_QLOGIC_1280 is not set |
617 | # CONFIG_SCSI_QLA_FC is not set | 627 | # CONFIG_SCSI_QLA_FC is not set |
628 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
618 | # CONFIG_SCSI_LPFC is not set | 629 | # CONFIG_SCSI_LPFC is not set |
619 | # CONFIG_SCSI_DC395x is not set | 630 | # CONFIG_SCSI_DC395x is not set |
620 | # CONFIG_SCSI_DC390T is not set | 631 | # CONFIG_SCSI_DC390T is not set |
@@ -658,7 +669,6 @@ CONFIG_SATA_INTEL_COMBINED=y | |||
658 | # CONFIG_PATA_HPT3X3 is not set | 669 | # CONFIG_PATA_HPT3X3 is not set |
659 | # CONFIG_PATA_IT821X is not set | 670 | # CONFIG_PATA_IT821X is not set |
660 | # CONFIG_PATA_JMICRON is not set | 671 | # CONFIG_PATA_JMICRON is not set |
661 | # CONFIG_PATA_LEGACY is not set | ||
662 | # CONFIG_PATA_TRIFLEX is not set | 672 | # CONFIG_PATA_TRIFLEX is not set |
663 | # CONFIG_PATA_MPIIX is not set | 673 | # CONFIG_PATA_MPIIX is not set |
664 | # CONFIG_PATA_OLDPIIX is not set | 674 | # CONFIG_PATA_OLDPIIX is not set |
@@ -667,7 +677,6 @@ CONFIG_SATA_INTEL_COMBINED=y | |||
667 | # CONFIG_PATA_OPTI is not set | 677 | # CONFIG_PATA_OPTI is not set |
668 | # CONFIG_PATA_OPTIDMA is not set | 678 | # CONFIG_PATA_OPTIDMA is not set |
669 | # CONFIG_PATA_PDC_OLD is not set | 679 | # CONFIG_PATA_PDC_OLD is not set |
670 | # CONFIG_PATA_QDI is not set | ||
671 | # CONFIG_PATA_RADISYS is not set | 680 | # CONFIG_PATA_RADISYS is not set |
672 | # CONFIG_PATA_RZ1000 is not set | 681 | # CONFIG_PATA_RZ1000 is not set |
673 | # CONFIG_PATA_SC1200 is not set | 682 | # CONFIG_PATA_SC1200 is not set |
@@ -684,6 +693,7 @@ CONFIG_SATA_INTEL_COMBINED=y | |||
684 | CONFIG_MD=y | 693 | CONFIG_MD=y |
685 | # CONFIG_BLK_DEV_MD is not set | 694 | # CONFIG_BLK_DEV_MD is not set |
686 | CONFIG_BLK_DEV_DM=y | 695 | CONFIG_BLK_DEV_DM=y |
696 | # CONFIG_DM_DEBUG is not set | ||
687 | # CONFIG_DM_CRYPT is not set | 697 | # CONFIG_DM_CRYPT is not set |
688 | # CONFIG_DM_SNAPSHOT is not set | 698 | # CONFIG_DM_SNAPSHOT is not set |
689 | # CONFIG_DM_MIRROR is not set | 699 | # CONFIG_DM_MIRROR is not set |
@@ -874,6 +884,7 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
874 | # Input device support | 884 | # Input device support |
875 | # | 885 | # |
876 | CONFIG_INPUT=y | 886 | CONFIG_INPUT=y |
887 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
877 | 888 | ||
878 | # | 889 | # |
879 | # Userland interfaces | 890 | # Userland interfaces |
@@ -896,6 +907,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
896 | # CONFIG_KEYBOARD_LKKBD is not set | 907 | # CONFIG_KEYBOARD_LKKBD is not set |
897 | # CONFIG_KEYBOARD_XTKBD is not set | 908 | # CONFIG_KEYBOARD_XTKBD is not set |
898 | # CONFIG_KEYBOARD_NEWTON is not set | 909 | # CONFIG_KEYBOARD_NEWTON is not set |
910 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
899 | CONFIG_INPUT_MOUSE=y | 911 | CONFIG_INPUT_MOUSE=y |
900 | CONFIG_MOUSE_PS2=y | 912 | CONFIG_MOUSE_PS2=y |
901 | # CONFIG_MOUSE_SERIAL is not set | 913 | # CONFIG_MOUSE_SERIAL is not set |
@@ -1023,12 +1035,12 @@ CONFIG_HANGCHECK_TIMER=y | |||
1023 | # Misc devices | 1035 | # Misc devices |
1024 | # | 1036 | # |
1025 | # CONFIG_IBM_ASM is not set | 1037 | # CONFIG_IBM_ASM is not set |
1038 | # CONFIG_TIFM_CORE is not set | ||
1026 | 1039 | ||
1027 | # | 1040 | # |
1028 | # Multimedia devices | 1041 | # Multimedia devices |
1029 | # | 1042 | # |
1030 | # CONFIG_VIDEO_DEV is not set | 1043 | # CONFIG_VIDEO_DEV is not set |
1031 | CONFIG_VIDEO_V4L2=y | ||
1032 | 1044 | ||
1033 | # | 1045 | # |
1034 | # Digital Video Broadcasting Devices | 1046 | # Digital Video Broadcasting Devices |
@@ -1134,6 +1146,7 @@ CONFIG_USB_STORAGE=y | |||
1134 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1146 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1135 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1147 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1136 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1148 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1149 | # CONFIG_USB_STORAGE_KARMA is not set | ||
1137 | # CONFIG_USB_LIBUSUAL is not set | 1150 | # CONFIG_USB_LIBUSUAL is not set |
1138 | 1151 | ||
1139 | # | 1152 | # |
@@ -1156,6 +1169,7 @@ CONFIG_USB_HIDINPUT=y | |||
1156 | # CONFIG_USB_ATI_REMOTE2 is not set | 1169 | # CONFIG_USB_ATI_REMOTE2 is not set |
1157 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1170 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
1158 | # CONFIG_USB_APPLETOUCH is not set | 1171 | # CONFIG_USB_APPLETOUCH is not set |
1172 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1159 | 1173 | ||
1160 | # | 1174 | # |
1161 | # USB Imaging devices | 1175 | # USB Imaging devices |
@@ -1187,6 +1201,7 @@ CONFIG_USB_MON=y | |||
1187 | # | 1201 | # |
1188 | # CONFIG_USB_EMI62 is not set | 1202 | # CONFIG_USB_EMI62 is not set |
1189 | # CONFIG_USB_EMI26 is not set | 1203 | # CONFIG_USB_EMI26 is not set |
1204 | # CONFIG_USB_ADUTUX is not set | ||
1190 | # CONFIG_USB_AUERSWALD is not set | 1205 | # CONFIG_USB_AUERSWALD is not set |
1191 | # CONFIG_USB_RIO500 is not set | 1206 | # CONFIG_USB_RIO500 is not set |
1192 | # CONFIG_USB_LEGOTOWER is not set | 1207 | # CONFIG_USB_LEGOTOWER is not set |
@@ -1194,9 +1209,9 @@ CONFIG_USB_MON=y | |||
1194 | # CONFIG_USB_LED is not set | 1209 | # CONFIG_USB_LED is not set |
1195 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1210 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
1196 | # CONFIG_USB_CYTHERM is not set | 1211 | # CONFIG_USB_CYTHERM is not set |
1197 | # CONFIG_USB_PHIDGETKIT is not set | 1212 | # CONFIG_USB_PHIDGET is not set |
1198 | # CONFIG_USB_PHIDGETSERVO is not set | ||
1199 | # CONFIG_USB_IDMOUSE is not set | 1213 | # CONFIG_USB_IDMOUSE is not set |
1214 | # CONFIG_USB_FTDI_ELAN is not set | ||
1200 | # CONFIG_USB_APPLEDISPLAY is not set | 1215 | # CONFIG_USB_APPLEDISPLAY is not set |
1201 | # CONFIG_USB_SISUSBVGA is not set | 1216 | # CONFIG_USB_SISUSBVGA is not set |
1202 | # CONFIG_USB_LD is not set | 1217 | # CONFIG_USB_LD is not set |
@@ -1281,6 +1296,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
1281 | # CONFIG_JFS_FS is not set | 1296 | # CONFIG_JFS_FS is not set |
1282 | CONFIG_FS_POSIX_ACL=y | 1297 | CONFIG_FS_POSIX_ACL=y |
1283 | # CONFIG_XFS_FS is not set | 1298 | # CONFIG_XFS_FS is not set |
1299 | # CONFIG_GFS2_FS is not set | ||
1284 | # CONFIG_OCFS2_FS is not set | 1300 | # CONFIG_OCFS2_FS is not set |
1285 | # CONFIG_MINIX_FS is not set | 1301 | # CONFIG_MINIX_FS is not set |
1286 | # CONFIG_ROMFS_FS is not set | 1302 | # CONFIG_ROMFS_FS is not set |
@@ -1315,8 +1331,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1315 | # | 1331 | # |
1316 | CONFIG_PROC_FS=y | 1332 | CONFIG_PROC_FS=y |
1317 | CONFIG_PROC_KCORE=y | 1333 | CONFIG_PROC_KCORE=y |
1334 | CONFIG_PROC_SYSCTL=y | ||
1318 | CONFIG_SYSFS=y | 1335 | CONFIG_SYSFS=y |
1319 | CONFIG_TMPFS=y | 1336 | CONFIG_TMPFS=y |
1337 | CONFIG_TMPFS_POSIX_ACL=y | ||
1320 | CONFIG_HUGETLBFS=y | 1338 | CONFIG_HUGETLBFS=y |
1321 | CONFIG_HUGETLB_PAGE=y | 1339 | CONFIG_HUGETLB_PAGE=y |
1322 | CONFIG_RAMFS=y | 1340 | CONFIG_RAMFS=y |
@@ -1366,6 +1384,7 @@ CONFIG_SUNRPC=y | |||
1366 | # CONFIG_CODA_FS is not set | 1384 | # CONFIG_CODA_FS is not set |
1367 | # CONFIG_AFS_FS is not set | 1385 | # CONFIG_AFS_FS is not set |
1368 | # CONFIG_9P_FS is not set | 1386 | # CONFIG_9P_FS is not set |
1387 | CONFIG_GENERIC_ACL=y | ||
1369 | 1388 | ||
1370 | # | 1389 | # |
1371 | # Partition Types | 1390 | # Partition Types |
@@ -1418,6 +1437,10 @@ CONFIG_NLS_ISO8859_15=y | |||
1418 | CONFIG_NLS_UTF8=y | 1437 | CONFIG_NLS_UTF8=y |
1419 | 1438 | ||
1420 | # | 1439 | # |
1440 | # Distributed Lock Manager | ||
1441 | # | ||
1442 | |||
1443 | # | ||
1421 | # Instrumentation Support | 1444 | # Instrumentation Support |
1422 | # | 1445 | # |
1423 | CONFIG_PROFILING=y | 1446 | CONFIG_PROFILING=y |
@@ -1452,11 +1475,13 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1452 | # CONFIG_DEBUG_INFO is not set | 1475 | # CONFIG_DEBUG_INFO is not set |
1453 | # CONFIG_DEBUG_FS is not set | 1476 | # CONFIG_DEBUG_FS is not set |
1454 | # CONFIG_DEBUG_VM is not set | 1477 | # CONFIG_DEBUG_VM is not set |
1478 | # CONFIG_DEBUG_LIST is not set | ||
1455 | # CONFIG_FRAME_POINTER is not set | 1479 | # CONFIG_FRAME_POINTER is not set |
1456 | CONFIG_UNWIND_INFO=y | 1480 | CONFIG_UNWIND_INFO=y |
1457 | CONFIG_STACK_UNWIND=y | 1481 | CONFIG_STACK_UNWIND=y |
1458 | # CONFIG_FORCED_INLINING is not set | 1482 | # CONFIG_FORCED_INLINING is not set |
1459 | # CONFIG_RCU_TORTURE_TEST is not set | 1483 | # CONFIG_RCU_TORTURE_TEST is not set |
1484 | # CONFIG_LKDTM is not set | ||
1460 | CONFIG_EARLY_PRINTK=y | 1485 | CONFIG_EARLY_PRINTK=y |
1461 | CONFIG_DEBUG_STACKOVERFLOW=y | 1486 | CONFIG_DEBUG_STACKOVERFLOW=y |
1462 | # CONFIG_DEBUG_STACK_USAGE is not set | 1487 | # CONFIG_DEBUG_STACK_USAGE is not set |