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 cpus4096
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
eseries_pxa_defconfig
diff --git
a/arch/arm/configs/eseries_pxa_defconfig
b/arch/arm/configs/eseries_pxa_defconfig
index
ed487b9
..
493ecee
100644
(file)
--- a/
arch/arm/configs/eseries_pxa_defconfig
+++ b/
arch/arm/configs/eseries_pxa_defconfig
@@
-251,7
+251,6
@@
CONFIG_PCMCIA_PXA2XX=m
# Kernel Features
#
# CONFIG_PREEMPT is not set
# Kernel Features
#
# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
CONFIG_HZ=100
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
CONFIG_HZ=100
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y