Merge branch 'devel' into next

[pandora-kernel.git] / arch / arm / configs / xm_x270_defconfig

diff --git a/arch/arm/configs/xm_x270_defconfig b/arch/arm/configs/xm_x270_defconfig
index 7b3576e..aa40d91 100644 (file)
--- a/arch/arm/configs/xm_x270_defconfig
+++ b/arch/arm/configs/xm_x270_defconfig
@@ -251,7 +251,6 @@ CONFIG_PCCARD_NONSTATIC=m
 #
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
-# CONFIG_NO_IDLE_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set