Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

[linux-2.6-omap-h63xx.git] / arch / arm / configs / ks8695_defconfig

diff --git a/arch/arm/configs/ks8695_defconfig b/arch/arm/configs/ks8695_defconfig
index 8ab21a0719e959097e465e714ec2a00084693302..6077f2cb88e4cecfce760d26237fd984ac6db594 100644 (file)
--- a/arch/arm/configs/ks8695_defconfig
+++ b/arch/arm/configs/ks8695_defconfig
@@ -174,7 +174,6 @@ CONFIG_PCCARD_NONSTATIC=y
 # Kernel Features
 #
 # 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