Skip to content

Commit

Permalink
Merge tag 'berlin64-soc-for-4.5-1' of git://git.infradead.org/users/h…
Browse files Browse the repository at this point in the history
…esselba/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
  • Loading branch information
Arnd Bergmann committed Dec 12, 2015
2 parents 208ef7f + 75d8e1b commit 2bf53f4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm64/Kconfig.platforms
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2bf53f4

Please sign in to comment.