diff options
author | Andi Kleen <ak@suse.de> | 2006-12-06 20:14:00 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:00 -0500 |
commit | dc3d1742543fffc79dc4d680ab64d2059e97d809 (patch) | |
tree | a9ffa02660f92d4c2d98af81e16bf61e4b25489e | |
parent | 8f820e976057261e249367514e9920cf20048c76 (diff) |
[PATCH] i386: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/i386/defconfig | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 97aacd6bd7d8..65891f11aced 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-rc2-git4 | 3 | # Linux kernel version: 2.6.19-git7 |
4 | # Sat Oct 21 03:38:56 2006 | 4 | # Wed Dec 6 23:50:49 2006 |
5 | # | 5 | # |
6 | CONFIG_X86_32=y | 6 | CONFIG_X86_32=y |
7 | CONFIG_GENERIC_TIME=y | 7 | CONFIG_GENERIC_TIME=y |
@@ -40,13 +40,14 @@ CONFIG_POSIX_MQUEUE=y | |||
40 | CONFIG_IKCONFIG=y | 40 | CONFIG_IKCONFIG=y |
41 | CONFIG_IKCONFIG_PROC=y | 41 | CONFIG_IKCONFIG_PROC=y |
42 | # CONFIG_CPUSETS is not set | 42 | # CONFIG_CPUSETS is not set |
43 | CONFIG_SYSFS_DEPRECATED=y | ||
43 | # CONFIG_RELAY is not set | 44 | # CONFIG_RELAY is not set |
44 | CONFIG_INITRAMFS_SOURCE="" | 45 | CONFIG_INITRAMFS_SOURCE="" |
45 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 46 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
46 | CONFIG_SYSCTL=y | 47 | CONFIG_SYSCTL=y |
47 | # CONFIG_EMBEDDED is not set | 48 | # CONFIG_EMBEDDED is not set |
48 | CONFIG_UID16=y | 49 | CONFIG_UID16=y |
49 | # CONFIG_SYSCTL_SYSCALL is not set | 50 | CONFIG_SYSCTL_SYSCALL=y |
50 | CONFIG_KALLSYMS=y | 51 | CONFIG_KALLSYMS=y |
51 | CONFIG_KALLSYMS_ALL=y | 52 | CONFIG_KALLSYMS_ALL=y |
52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 53 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -110,6 +111,7 @@ CONFIG_SMP=y | |||
110 | # CONFIG_X86_VISWS is not set | 111 | # CONFIG_X86_VISWS is not set |
111 | CONFIG_X86_GENERICARCH=y | 112 | CONFIG_X86_GENERICARCH=y |
112 | # CONFIG_X86_ES7000 is not set | 113 | # CONFIG_X86_ES7000 is not set |
114 | # CONFIG_PARAVIRT is not set | ||
113 | CONFIG_X86_CYCLONE_TIMER=y | 115 | CONFIG_X86_CYCLONE_TIMER=y |
114 | # CONFIG_M386 is not set | 116 | # CONFIG_M386 is not set |
115 | # CONFIG_M486 is not set | 117 | # CONFIG_M486 is not set |
@@ -120,6 +122,7 @@ CONFIG_X86_CYCLONE_TIMER=y | |||
120 | # CONFIG_MPENTIUMII is not set | 122 | # CONFIG_MPENTIUMII is not set |
121 | CONFIG_MPENTIUMIII=y | 123 | CONFIG_MPENTIUMIII=y |
122 | # CONFIG_MPENTIUMM is not set | 124 | # CONFIG_MPENTIUMM is not set |
125 | # CONFIG_MCORE2 is not set | ||
123 | # CONFIG_MPENTIUM4 is not set | 126 | # CONFIG_MPENTIUM4 is not set |
124 | # CONFIG_MK6 is not set | 127 | # CONFIG_MK6 is not set |
125 | # CONFIG_MK7 is not set | 128 | # CONFIG_MK7 is not set |
@@ -197,7 +200,6 @@ CONFIG_RESOURCES_64BIT=y | |||
197 | CONFIG_MTRR=y | 200 | CONFIG_MTRR=y |
198 | # CONFIG_EFI is not set | 201 | # CONFIG_EFI is not set |
199 | # CONFIG_IRQBALANCE is not set | 202 | # CONFIG_IRQBALANCE is not set |
200 | CONFIG_REGPARM=y | ||
201 | CONFIG_SECCOMP=y | 203 | CONFIG_SECCOMP=y |
202 | # CONFIG_HZ_100 is not set | 204 | # CONFIG_HZ_100 is not set |
203 | CONFIG_HZ_250=y | 205 | CONFIG_HZ_250=y |
@@ -205,7 +207,8 @@ CONFIG_HZ_250=y | |||
205 | CONFIG_HZ=250 | 207 | CONFIG_HZ=250 |
206 | # CONFIG_KEXEC is not set | 208 | # CONFIG_KEXEC is not set |
207 | # CONFIG_CRASH_DUMP is not set | 209 | # CONFIG_CRASH_DUMP is not set |
208 | CONFIG_PHYSICAL_START=0x100000 | 210 | # CONFIG_RELOCATABLE is not set |
211 | CONFIG_PHYSICAL_ALIGN=0x100000 | ||
209 | # CONFIG_HOTPLUG_CPU is not set | 212 | # CONFIG_HOTPLUG_CPU is not set |
210 | CONFIG_COMPAT_VDSO=y | 213 | CONFIG_COMPAT_VDSO=y |
211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 214 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -367,6 +370,7 @@ CONFIG_INET_TCP_DIAG=y | |||
367 | # CONFIG_TCP_CONG_ADVANCED is not set | 370 | # CONFIG_TCP_CONG_ADVANCED is not set |
368 | CONFIG_TCP_CONG_CUBIC=y | 371 | CONFIG_TCP_CONG_CUBIC=y |
369 | CONFIG_DEFAULT_TCP_CONG="cubic" | 372 | CONFIG_DEFAULT_TCP_CONG="cubic" |
373 | # CONFIG_TCP_MD5SIG is not set | ||
370 | CONFIG_IPV6=y | 374 | CONFIG_IPV6=y |
371 | # CONFIG_IPV6_PRIVACY is not set | 375 | # CONFIG_IPV6_PRIVACY is not set |
372 | # CONFIG_IPV6_ROUTER_PREF is not set | 376 | # CONFIG_IPV6_ROUTER_PREF is not set |
@@ -677,6 +681,7 @@ CONFIG_SATA_INTEL_COMBINED=y | |||
677 | # CONFIG_PATA_IT821X is not set | 681 | # CONFIG_PATA_IT821X is not set |
678 | # CONFIG_PATA_JMICRON is not set | 682 | # CONFIG_PATA_JMICRON is not set |
679 | # CONFIG_PATA_TRIFLEX is not set | 683 | # CONFIG_PATA_TRIFLEX is not set |
684 | # CONFIG_PATA_MARVELL is not set | ||
680 | # CONFIG_PATA_MPIIX is not set | 685 | # CONFIG_PATA_MPIIX is not set |
681 | # CONFIG_PATA_OLDPIIX is not set | 686 | # CONFIG_PATA_OLDPIIX is not set |
682 | # CONFIG_PATA_NETCELL is not set | 687 | # CONFIG_PATA_NETCELL is not set |
@@ -850,6 +855,7 @@ CONFIG_BNX2=y | |||
850 | # CONFIG_IXGB is not set | 855 | # CONFIG_IXGB is not set |
851 | # CONFIG_S2IO is not set | 856 | # CONFIG_S2IO is not set |
852 | # CONFIG_MYRI10GE is not set | 857 | # CONFIG_MYRI10GE is not set |
858 | # CONFIG_NETXEN_NIC is not set | ||
853 | 859 | ||
854 | # | 860 | # |
855 | # Token Ring devices | 861 | # Token Ring devices |
@@ -984,10 +990,6 @@ CONFIG_RTC=y | |||
984 | # CONFIG_R3964 is not set | 990 | # CONFIG_R3964 is not set |
985 | # CONFIG_APPLICOM is not set | 991 | # CONFIG_APPLICOM is not set |
986 | # CONFIG_SONYPI is not set | 992 | # CONFIG_SONYPI is not set |
987 | |||
988 | # | ||
989 | # Ftape, the floppy tape device driver | ||
990 | # | ||
991 | CONFIG_AGP=y | 993 | CONFIG_AGP=y |
992 | # CONFIG_AGP_ALI is not set | 994 | # CONFIG_AGP_ALI is not set |
993 | # CONFIG_AGP_ATI is not set | 995 | # CONFIG_AGP_ATI is not set |
@@ -1108,6 +1110,7 @@ CONFIG_USB_DEVICEFS=y | |||
1108 | # CONFIG_USB_BANDWIDTH is not set | 1110 | # CONFIG_USB_BANDWIDTH is not set |
1109 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1111 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1110 | # CONFIG_USB_SUSPEND is not set | 1112 | # CONFIG_USB_SUSPEND is not set |
1113 | # CONFIG_USB_MULTITHREAD_PROBE is not set | ||
1111 | # CONFIG_USB_OTG is not set | 1114 | # CONFIG_USB_OTG is not set |
1112 | 1115 | ||
1113 | # | 1116 | # |
@@ -1185,6 +1188,7 @@ CONFIG_USB_HIDINPUT=y | |||
1185 | # CONFIG_USB_KAWETH is not set | 1188 | # CONFIG_USB_KAWETH is not set |
1186 | # CONFIG_USB_PEGASUS is not set | 1189 | # CONFIG_USB_PEGASUS is not set |
1187 | # CONFIG_USB_RTL8150 is not set | 1190 | # CONFIG_USB_RTL8150 is not set |
1191 | # CONFIG_USB_USBNET_MII is not set | ||
1188 | # CONFIG_USB_USBNET is not set | 1192 | # CONFIG_USB_USBNET is not set |
1189 | CONFIG_USB_MON=y | 1193 | CONFIG_USB_MON=y |
1190 | 1194 | ||