git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/core' into x86/mce2
[pandora-kernel.git]
/
arch
/
x86
/
configs
/
i386_defconfig
diff --git
a/arch/x86/configs/i386_defconfig
b/arch/x86/configs/i386_defconfig
index
c2cae41
..
235b81d
100644
(file)
--- 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