Merge branch 'topic/asoc' into for-linus

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

diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index 3796397fde20edf16fc20cfe32b624fafa7a517d..35faaea8623e43f3e47a86de92255a09184d8724 100644 (file)
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -288,7 +288,6 @@ CONFIG_ISA=y
 #
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=200
 # CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set