diff options
author | Andi Kleen <ak@suse.de> | 2006-09-29 19:47:54 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-29 19:47:54 -0400 |
commit | 81b999b10b3246fd80691a7936a564deb99640b9 (patch) | |
tree | d1562f744dceebb08dbec22f11c9aafab8b3e951 /arch | |
parent | d6c641026dec68acfb4b0baa98aad960e963ed97 (diff) |
[PATCH] Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/defconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 647610ecb580..4844b543bed0 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig | |||
@@ -1,11 +1,12 @@ | |||
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-git5 | 3 | # Linux kernel version: 2.6.18-git7 |
4 | # Tue Sep 26 09:30:47 2006 | 4 | # Wed Sep 27 21:53:10 2006 |
5 | # | 5 | # |
6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
8 | CONFIG_X86=y | 8 | CONFIG_X86=y |
9 | CONFIG_ZONE_DMA32=y | ||
9 | CONFIG_LOCKDEP_SUPPORT=y | 10 | CONFIG_LOCKDEP_SUPPORT=y |
10 | CONFIG_STACKTRACE_SUPPORT=y | 11 | CONFIG_STACKTRACE_SUPPORT=y |
11 | CONFIG_SEMAPHORE_SLEEPERS=y | 12 | CONFIG_SEMAPHORE_SLEEPERS=y |
@@ -179,6 +180,7 @@ CONFIG_GENERIC_PENDING_IRQ=y | |||
179 | CONFIG_PM=y | 180 | CONFIG_PM=y |
180 | # CONFIG_PM_LEGACY is not set | 181 | # CONFIG_PM_LEGACY is not set |
181 | # CONFIG_PM_DEBUG is not set | 182 | # CONFIG_PM_DEBUG is not set |
183 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
182 | CONFIG_SOFTWARE_SUSPEND=y | 184 | CONFIG_SOFTWARE_SUSPEND=y |
183 | CONFIG_PM_STD_PARTITION="" | 185 | CONFIG_PM_STD_PARTITION="" |
184 | CONFIG_SUSPEND_SMP=y | 186 | CONFIG_SUSPEND_SMP=y |
@@ -251,6 +253,7 @@ CONFIG_PCI_DIRECT=y | |||
251 | CONFIG_PCI_MMCONFIG=y | 253 | CONFIG_PCI_MMCONFIG=y |
252 | CONFIG_PCIEPORTBUS=y | 254 | CONFIG_PCIEPORTBUS=y |
253 | CONFIG_PCI_MSI=y | 255 | CONFIG_PCI_MSI=y |
256 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
254 | # CONFIG_PCI_DEBUG is not set | 257 | # CONFIG_PCI_DEBUG is not set |
255 | 258 | ||
256 | # | 259 | # |
@@ -1458,6 +1461,7 @@ CONFIG_KPROBES=y | |||
1458 | # | 1461 | # |
1459 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1462 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1460 | # CONFIG_PRINTK_TIME is not set | 1463 | # CONFIG_PRINTK_TIME is not set |
1464 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
1461 | CONFIG_MAGIC_SYSRQ=y | 1465 | CONFIG_MAGIC_SYSRQ=y |
1462 | CONFIG_UNUSED_SYMBOLS=y | 1466 | CONFIG_UNUSED_SYMBOLS=y |
1463 | CONFIG_DEBUG_KERNEL=y | 1467 | CONFIG_DEBUG_KERNEL=y |