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 'linus' into core/softlockup
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
realview-smp_defconfig
diff --git
a/arch/arm/configs/realview-smp_defconfig
b/arch/arm/configs/realview-smp_defconfig
index
fc39ba1
..
0c09b23
100644
(file)
--- a/
arch/arm/configs/realview-smp_defconfig
+++ b/
arch/arm/configs/realview-smp_defconfig
@@
-177,7
+177,6
@@
CONFIG_NR_CPUS=4
CONFIG_HOTPLUG_CPU=y
CONFIG_LOCAL_TIMERS=y
# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
CONFIG_HZ=100
# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set