diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-30 11:28:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-30 11:28:41 +0100 |
| commit | 6918821e233280ffbba0bb1f5326137c156af44c (patch) | |
| tree | 3e8013f2c80b5222a71eed8edaa69f05bf422473 | |
| parent | 6fe70bb73ef2fa814d88220c38f2ca07342aea75 (diff) | |
| parent | 0589bbba398d0f0385eb0f3faa3ee3b18bce42bc (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
| -rw-r--r-- | linaro/configs/linaro-base.conf | 1 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index 34ed2dbd4922..4ec01a909d49 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -96,3 +96,4 @@ CONFIG_JUMP_LABEL=y CONFIG_STRICT_DEVMEM=y CONFIG_KGDB=y CONFIG_KGDB_TESTS=y +CONFIG_OF_IDLE_STATES=y diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index e6deb16e8923..d6a714657e26 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -51,3 +51,4 @@ CONFIG_PM_OPP=y CONFIG_GENERIC_CPUFREQ_CPU0=y CONFIG_ARM_BIG_LITTLE_CPUFREQ=y CONFIG_ARM_DT_BL_CPUFREQ=y +CONFIG_ARM64_CPUIDLE=y |