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
/
x86_64_defconfig
diff --git
a/arch/x86/configs/x86_64_defconfig
b/arch/x86/configs/x86_64_defconfig
index 10728fd91c630e1189bd5a9b0cefe01e86790df7..2efb5d5063ff968afad50a449a98fbdc3e0a1705 100644
(file)
--- a/
arch/x86/configs/x86_64_defconfig
+++ b/
arch/x86/configs/x86_64_defconfig
@@
-198,7
+198,6
@@
CONFIG_SPARSE_IRQ=y
# CONFIG_NUMA_MIGRATE_IRQ_DESC is not set
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