aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <[email protected]>2015-10-15 22:04:18 +0200
committerArnd Bergmann <[email protected]>2015-10-15 22:04:18 +0200
commitdc7a4996741249209d3b0fc200545de877e1fe37 (patch)
treead887272ecf774d87325b5c9544fd6b21c6e9c4d
parent19f47051e59d1366912705b367ceca26cdbe3428 (diff)
parentc582fbfba581d1331a52a85f0d712b0b7ec961c3 (diff)
Merge tag 'berlin64-soc-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
Merge "Marvell Berlin ARM64 SoC for 4.4 take 1" from Sebastian Hesselbarth: - enable ARCH_REQUIRE_GPIOLIB for DW GPIO driver * tag 'berlin64-soc-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin: arm64: berlin: enable ARCH_REQUIRE_GPIOLIB
-rw-r--r--arch/arm64/Kconfig.platforms1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 23800a19a7bc..c6e2c75c04fc 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -7,6 +7,7 @@ config ARCH_BCM_IPROC
config ARCH_BERLIN
bool "Marvell Berlin SoC Family"
+ select ARCH_REQUIRE_GPIOLIB
select DW_APB_ICTL
help
This enables support for Marvell Berlin SoC Family