git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
configs
/
x86_64_defconfig
diff --git
a/arch/x86/configs/x86_64_defconfig
b/arch/x86/configs/x86_64_defconfig
index 9fe5d212ab4cc8291e0c55ebdc619a57c85f2d64..27b8ce0f590863dcf1901a85ba12d30a19ccb76d 100644
(file)
--- a/
arch/x86/configs/x86_64_defconfig
+++ b/
arch/x86/configs/x86_64_defconfig
@@
-195,7
+195,6
@@
CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
CONFIG_SPARSE_IRQ=y
-# CONFIG_NUMA_MIGRATE_IRQ_DESC is not set
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_ELAN is not set