Merge branch 'topic/asoc' into for-linus

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

diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig
index d846a492e5ce2a446f0c1017e1edd1ca891c067f..85c80f723d8e7f43d5287c34cd911059a5e1e31a 100644 (file)
--- a/arch/arm/configs/ateb9200_defconfig
+++ b/arch/arm/configs/ateb9200_defconfig
@@ -171,7 +171,6 @@ CONFIG_AT91_CF=m
 # Kernel Features
 #
 CONFIG_PREEMPT=y
-CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
 # CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set