summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/kafa_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 22:39:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 22:39:59 +0200
commit0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch)
tree2df65ebb958f930abf0b7ad35fd6e528398b1679 /arch/arm/configs/kafa_defconfig
parent76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadkernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.tar.gz
kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.tar.xz
kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.zip
Merge branch 'linus' into pci-for-jesse
Diffstat (limited to 'arch/arm/configs/kafa_defconfig')
-rw-r--r--arch/arm/configs/kafa_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig
index ae51a40db6f..6dd95a2c8d5 100644
--- a/arch/arm/configs/kafa_defconfig
+++ b/arch/arm/configs/kafa_defconfig
@@ -162,7 +162,6 @@ CONFIG_CPU_TLB_V4WBI=y
# Kernel Features
#
CONFIG_PREEMPT=y
-# CONFIG_NO_IDLE_HZ is not set
CONFIG_HZ=100
# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set