Merge tag 'berlin64-soc-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/config64 · 2bf53f4e48 - Gogs: Go Git Service GfA electronic

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

Arnd Bergmann 9 years ago

parent

208ef7f18d 75d8e1baa5

commit

2bf53f4e48

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/arm64/Kconfig.platforms
							 
								View File
							
				@@ -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