diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 23:10:02 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 23:10:02 +0000 |
| commit | 54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743 (patch) | |
| tree | 924613494fac61514c0fc806920ed5032f2322a6 /arch/arm/mach-mvebu/Kconfig | |
| parent | b03e119fff8a06f55faaaa11c6259829fe81cbb4 (diff) | |
| parent | e53b1fd432497942a0fdfd0e89c3d30241cb4d2c (diff) | |
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
Conflicts:
arch/arm/mach-mvebu/pmsu.c
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index e5ab3a7cb3d..8e3b5f12cd7 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -10,6 +10,7 @@ config ARCH_MVEBU select ZONE_DMA if ARM_LPAE select ARCH_REQUIRE_GPIOLIB select PCI_QUIRKS if PCI + select OF_ADDRESS_PCI if ARCH_MVEBU @@ -19,6 +20,7 @@ config MACH_MVEBU_V7 bool select ARMADA_370_XP_TIMER select CACHE_L2X0 + select ARM_CPU_SUSPEND config MACH_ARMADA_370 bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 |