Merge branch 'linus' into x86/urgent
[pandora-kernel.git] / arch / arm / configs / pnx4008_defconfig
index b5e11aa..811b8f6 100644 (file)
@@ -151,7 +151,6 @@ CONFIG_ARM_THUMB=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