Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a119a2c4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zte-defconfig64-4.9' of...

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
parents 6f9a53ee ba1f4d81
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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