diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 23:33:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 23:33:12 +0100 |
| commit | f9098036af2ac373173843480cdba1b6b390745c (patch) | |
| tree | 5360401bbe907871831fadaa1099ddb270e18d13 /arch/arm64/configs | |
| parent | 5e2837a5e6f7cfea7a1a0959cea3ee4a8439d3f2 (diff) | |
| parent | 4cf430ee0c2ba1da97cab10b904291eb6fc5f170 (diff) | |
| download | linux-f9098036af2ac373173843480cdba1b6b390745c.tar.gz linux-f9098036af2ac373173843480cdba1b6b390745c.tar.bz2 linux-f9098036af2ac373173843480cdba1b6b390745c.zip | |
Merge tag 'arm-soc/for-4.6/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64
Merge "Broadcom defconfig-arm64 changes for 4.6" from Florian Fainelli:
This pull request contains ARM64 defconfig changes for Broadcom SoCs:
- Jayachandran C enables the newly introduced Broadcom Vulcan SoC to the ARM64
defconfig
* tag 'arm-soc/for-4.6/defconfig-arm64' of http://github.com/Broadcom/stblinux:
arm64: defconfig: Add Broadcom Vulcan to defconfig
Diffstat (limited to 'arch/arm64/configs')
| -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 15cdb4734440..0c713fedfe8b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -49,6 +49,7 @@ CONFIG_ARCH_SPRD=y CONFIG_ARCH_THUNDER=y CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_VULCAN=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y CONFIG_PCI=y |