diff options
| author | Arnd Bergmann | 2016-09-19 22:35:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2016-09-19 22:35:21 +0200 |
| commit | a119a2c4c093716193574675590ea4a7835fa277 (patch) | |
| tree | e2dcc3500baf8d0011fd7b39412cba4028f40671 | |
| parent | 6f9a53ee2376329a3e8d08d852cd08540b4070b2 (diff) | |
| parent | ba1f4d81707ab30dd342024dfa2cf50bb8003ece (diff) | |
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
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c3a9bf29b748..dab2cb0c1f1c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -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 |