diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 00:11:51 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 00:11:51 (GMT) |
| commit | 638bee71c83a2837b48062fdc5b222163cf53d79 (patch) | |
| tree | 9c1699c07a5aa547d769138317279b8ee1ba89e8 /arch/x86/configs/i386_defconfig | |
| parent | 2aaa822984b97efd894d10d1e1382206ef0291a7 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
| download | linux-fsl-qoriq-638bee71c83a2837b48062fdc5b222163cf53d79.tar.xz | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'arch/x86/configs/i386_defconfig')
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index c2cae41..235b81d 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig @@ -196,9 +196,7 @@ CONFIG_SMP=y CONFIG_SPARSE_IRQ=y CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y -CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set -# CONFIG_X86_VOYAGER is not set # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_VSMP is not set # CONFIG_X86_RDC321X is not set |