summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Lezcano2013-09-30 13:36:36 +0200
committerLinus Walleij2013-11-26 21:01:40 +0100
commit59b023e9bf62933f7078dec339b110d5785f63f6 (patch)
tree3c3355aa319d44a983e967fcd95db32842b3f3a4 /arch
parentu8500_defconfig: allow creation and mounting of devtmpfs (diff)
downloadkernel-qcow2-linux-59b023e9bf62933f7078dec339b110d5785f63f6.tar.gz
kernel-qcow2-linux-59b023e9bf62933f7078dec339b110d5785f63f6.tar.xz
kernel-qcow2-linux-59b023e9bf62933f7078dec339b110d5785f63f6.zip
ARM: ux500: u8500_defconfig: add missing cpuidle option
With the commit d3f2950f2adeea3da0317e952914b59adaa4cdb3, the option ARM_U8500_CPUIDLE was added to the Kconfig but not reflected in the default config file, hence the cpuidle driver is no longer enabled since this commit. Enable it again by adding the missing option in the default config file. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/u8500_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 3738cd695132..c6ebc184bf68 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_IDLE=y
+CONFIG_ARM_U8500_CPUIDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_PM_RUNTIME=y