diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-29 19:47:55 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-29 19:47:55 -0400 |
| commit | ae853e79faa27ca1a08c8ae3b5aee71ea98482f9 (patch) | |
| tree | 3c117c69ecc4fc55fc4bb4858f024b0066126c07 | |
| parent | 81b999b10b3246fd80691a7936a564deb99640b9 (diff) | |
[PATCH] i386: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
| -rw-r--r-- | arch/i386/defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 1a29bfa26d0c..ee2d79bd8af7 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-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_32=y | 6 | CONFIG_X86_32=y |
| 7 | CONFIG_GENERIC_TIME=y | 7 | CONFIG_GENERIC_TIME=y |
| @@ -210,6 +210,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
| 210 | CONFIG_PM=y | 210 | CONFIG_PM=y |
| 211 | CONFIG_PM_LEGACY=y | 211 | CONFIG_PM_LEGACY=y |
| 212 | # CONFIG_PM_DEBUG is not set | 212 | # CONFIG_PM_DEBUG is not set |
| 213 | CONFIG_PM_SYSFS_DEPRECATED=y | ||
| 213 | 214 | ||
| 214 | # | 215 | # |
| 215 | # ACPI (Advanced Configuration and Power Interface) Support | 216 | # ACPI (Advanced Configuration and Power Interface) Support |
| @@ -292,6 +293,7 @@ CONFIG_PCI_DIRECT=y | |||
| 292 | CONFIG_PCI_MMCONFIG=y | 293 | CONFIG_PCI_MMCONFIG=y |
| 293 | # CONFIG_PCIEPORTBUS is not set | 294 | # CONFIG_PCIEPORTBUS is not set |
| 294 | CONFIG_PCI_MSI=y | 295 | CONFIG_PCI_MSI=y |
| 296 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 295 | # CONFIG_PCI_DEBUG is not set | 297 | # CONFIG_PCI_DEBUG is not set |
| 296 | CONFIG_ISA_DMA_API=y | 298 | CONFIG_ISA_DMA_API=y |
| 297 | # CONFIG_ISA is not set | 299 | # CONFIG_ISA is not set |
| @@ -1427,6 +1429,7 @@ CONFIG_KPROBES=y | |||
| 1427 | # | 1429 | # |
| 1428 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1430 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1429 | # CONFIG_PRINTK_TIME is not set | 1431 | # CONFIG_PRINTK_TIME is not set |
| 1432 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 1430 | CONFIG_MAGIC_SYSRQ=y | 1433 | CONFIG_MAGIC_SYSRQ=y |
| 1431 | CONFIG_UNUSED_SYMBOLS=y | 1434 | CONFIG_UNUSED_SYMBOLS=y |
| 1432 | CONFIG_DEBUG_KERNEL=y | 1435 | CONFIG_DEBUG_KERNEL=y |
