diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:20:45 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:20:45 +0100 |
| commit | 2bf53f4e48fd14b0447a14768c6b0cca47b21a19 (patch) | |
| tree | 219450a850a9c94c50fae860ece64689a96996ce /arch/arm64/Kconfig.platforms | |
| parent | arm64: defconfig: enable UniPhier SoCs support (diff) | |
| parent | arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs (diff) | |
| download | linux-2bf53f4e48fd14b0447a14768c6b0cca47b21a19.tar.xz linux-2bf53f4e48fd14b0447a14768c6b0cca47b21a19.zip | |
Merge tag 'berlin64-soc-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/config64
Merge "Marvell Berlin64 SoC changes (round 1)" from Sebastian Hesselbarth:
- add PINCTRL dependency
* tag 'berlin64-soc-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin:
arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 0b9c8ddb28c6..aec40354f3de 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -9,6 +9,7 @@ config ARCH_BERLIN bool "Marvell Berlin SoC Family" select ARCH_REQUIRE_GPIOLIB select DW_APB_ICTL + select PINCTRL help This enables support for Marvell Berlin SoC Family |