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 'devel' into next
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
at91sam9263ek_defconfig
diff --git
a/arch/arm/configs/at91sam9263ek_defconfig
b/arch/arm/configs/at91sam9263ek_defconfig
index
32a0d74
..
fa1c5ae
100644
(file)
--- a/
arch/arm/configs/at91sam9263ek_defconfig
+++ b/
arch/arm/configs/at91sam9263ek_defconfig
@@
-213,7
+213,6
@@
CONFIG_CPU_CP15_MMU=y
#
# CONFIG_TICK_ONESHOT is not set
# CONFIG_PREEMPT is not set
#
# CONFIG_TICK_ONESHOT is not set
# 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
CONFIG_HZ=100
# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set