diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-14 20:11:25 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-14 20:11:25 -0500 |
| commit | ddf54e498ac71537bbee1ef3c5d3ad286ff9454c (patch) | |
| tree | 2ea49e4f50fe5e345a751bb82e0a08f24f6fc82a | |
| parent | 6e4d61d923944b81775b8a43b65750c5912d20d8 (diff) | |
| parent | e42dcfbba1f0ab3050a7c550a4119e2945553042 (diff) | |
Merge tag 'mvebu-defconfig-3.20' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "mvebu: defconfig for v3.20" from Andrew Lunn:
mvebu defconfig changes for v3.20
- enable CPUFREQ_DT in mvebu_v7_defconfig
* tag 'mvebu-defconfig-3.20' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: enable CPUFREQ_DT in mvebu_v7_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 627accea72fb..05edf4622c8d 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig | |||
| @@ -26,6 +26,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 | |||
| 26 | CONFIG_ARM_APPENDED_DTB=y | 26 | CONFIG_ARM_APPENDED_DTB=y |
| 27 | CONFIG_ARM_ATAG_DTB_COMPAT=y | 27 | CONFIG_ARM_ATAG_DTB_COMPAT=y |
| 28 | CONFIG_CPU_FREQ=y | 28 | CONFIG_CPU_FREQ=y |
| 29 | CONFIG_CPUFREQ_DT=y | ||
| 29 | CONFIG_CPU_IDLE=y | 30 | CONFIG_CPU_IDLE=y |
| 30 | CONFIG_ARM_MVEBU_V7_CPUIDLE=y | 31 | CONFIG_ARM_MVEBU_V7_CPUIDLE=y |
| 31 | CONFIG_VFP=y | 32 | CONFIG_VFP=y |