diff options
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 8f40a80ccb55..c2cae417fab8 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/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.29-rc4 | 3 | # Linux kernel version: 2.6.29-rc4 |
| 4 | # Thu Feb 12 12:57:57 2009 | 4 | # Tue Feb 24 15:50:58 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
| 7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
| @@ -268,7 +268,9 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 268 | CONFIG_X86_LOCAL_APIC=y | 268 | CONFIG_X86_LOCAL_APIC=y |
| 269 | CONFIG_X86_IO_APIC=y | 269 | CONFIG_X86_IO_APIC=y |
| 270 | CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y | 270 | CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y |
| 271 | # CONFIG_X86_MCE is not set | 271 | CONFIG_X86_MCE=y |
| 272 | CONFIG_X86_MCE_NONFATAL=y | ||
| 273 | CONFIG_X86_MCE_P4THERMAL=y | ||
| 272 | CONFIG_VM86=y | 274 | CONFIG_VM86=y |
| 273 | # CONFIG_TOSHIBA is not set | 275 | # CONFIG_TOSHIBA is not set |
| 274 | # CONFIG_I8K is not set | 276 | # CONFIG_I8K is not set |
