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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
corgi_defconfig
diff --git
a/arch/arm/configs/corgi_defconfig
b/arch/arm/configs/corgi_defconfig
index
e8980a9
..
9b8748a
100644
(file)
--- a/
arch/arm/configs/corgi_defconfig
+++ b/
arch/arm/configs/corgi_defconfig
@@
-165,7
+165,6
@@
CONFIG_PCMCIA_PXA2XX=y
# Kernel Features
#
CONFIG_PREEMPT=y
-# CONFIG_NO_IDLE_HZ is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y