Merge branch 'linus' into x86/amd-iommu

[sfrench/cifs-2.6.git] / arch / arm / configs / ixp2000_defconfig

diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig
index f8f9793b526f243187ec24754f8fcb6bf7422506..84680db6c6152c49a578a77f73a03736f9ea9613 100644 (file)
--- a/arch/arm/configs/ixp2000_defconfig
+++ b/arch/arm/configs/ixp2000_defconfig
@@ -184,7 +184,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