Merge tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/arm64 · a119a2c4c0 - Gogs: Go Git Service GfA electronic

Merge tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/arm64

Pull "ZTE arm64 defconfig updates for 4.9" from Shawn Guo:
 - Enable ZTE ZX family support in arm64 defconfig

* tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable ZTE ZX related config

Arnd Bergmann 9 years ago

parent

6f9a53ee23 ba1f4d8170

commit

a119a2c4c0

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/arm64/configs/defconfig
							 
								View File
							
				@@ -57,6 +57,7 @@ CONFIG_ARCH_UNIPHIER=y
			
				 CONFIG_ARCH_VEXPRESS=y
			
				 CONFIG_ARCH_VULCAN=y
			
				 CONFIG_ARCH_XGENE=y
			
				+CONFIG_ARCH_ZX=y
			
				 CONFIG_ARCH_ZYNQMP=y
			
				 CONFIG_PCI=y
			
				 CONFIG_PCI_MSI=y