Merge commit 'v2.6.29-rc1' into x86/urgent

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

diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig
index 27cf022dd807195f5703910fcc7d74164983510f..4a2f7b2372db3acd7aa418567bfd38733de719f8 100644 (file)
--- a/arch/arm/configs/ixp23xx_defconfig
+++ b/arch/arm/configs/ixp23xx_defconfig
@@ -180,7 +180,6 @@ CONFIG_PCI=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