diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 11:41:36 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 11:41:36 +0000 |
| commit | 5abe65e3d67aac9f9b5c08660f817a2d6ec5515f (patch) | |
| tree | 7422d99151ab4967a4b0f1783a156e6a1527ccde /arch/arm/mach-mvebu/Kconfig | |
| parent | ba364fc752daeded072a5ef31e43b84cb1f9e5fd (diff) | |
| parent | a728b977429383b3fe92b6e3bff9e69365609e0f (diff) | |
Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
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 e5ab3a7cb3d2..8e3b5f12cd7c 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 |