projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug...
[linux-2.6-block.git]
/
arch
/
x86
/
configs
/
i386_defconfig
diff --git
a/arch/x86/configs/i386_defconfig
b/arch/x86/configs/i386_defconfig
index 8f40a80ccb55bf44db2fc77561ca24fdce6e0e42..096dd5359cd91be458dc510814f8f9b72df174d2 100644
(file)
--- a/
arch/x86/configs/i386_defconfig
+++ b/
arch/x86/configs/i386_defconfig
@@
-196,7
+196,6
@@
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