aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 20:19:30 -0700
committerOlof Johansson <olof@lixom.net>2017-06-18 20:19:30 -0700
commita91ca5e37614e2193efe36db09d12a76c37b50da (patch)
treea998f18881616296d57f1e640d6ed515853872bf /arch
parentMerge tag 'realtek-arm64-soc-for-4.12' of git://github.com/afaerber/linux into next/arm64 (diff)
parentarm64: defconfig: Enable ARCH_BRCMSTB (diff)
downloadlinux-dev-a91ca5e37614e2193efe36db09d12a76c37b50da.tar.xz
linux-dev-a91ca5e37614e2193efe36db09d12a76c37b50da.zip
Merge tag 'arm-soc/for-4.13/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64
This pull request contains ARM64 defconfig changes for 4.13, please pull the following: - Florian enables ARCH_BRCMSTB in the arm64 defconfig to get more build coverage * tag 'arm-soc/for-4.13/defconfig-arm64' of http://github.com/Broadcom/stblinux: arm64: defconfig: Enable ARCH_BRCMSTB Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 96224b2f8ee3..e1bc2fa12778 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -36,6 +36,7 @@ CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_BCM2835=y
CONFIG_ARCH_BCM_IPROC=y
CONFIG_ARCH_BERLIN=y
+CONFIG_ARCH_BRCMSTB=y
CONFIG_ARCH_EXYNOS=y
CONFIG_ARCH_LAYERSCAPE=y
CONFIG_ARCH_LG1K=y