summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-03-24 10:14:14 -0700
committerFlorian Fainelli <f.fainelli@gmail.com>2017-03-24 10:14:14 -0700
commit1aaf0f47350ef912dd65d58cd94d4976b02e78c7 (patch)
tree0387092a984b88ae0e38d2fcd0959b42c3eee3cc
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
parent3c9d36192802d60fca73c85c7096221371c36be7 (diff)
downloadlinux-1aaf0f47350ef912dd65d58cd94d4976b02e78c7.tar.gz
linux-1aaf0f47350ef912dd65d58cd94d4976b02e78c7.tar.xz
Merge tag 'bcm2835-defconfig-64-next-2017-03-21' into defconfig-arm64/next
This pull request starts building the new SDHOST MMC driver on multi_v7_defconfig, so that we can switch to it by default in the following release. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-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 7c48028ec64a..519a55c825d5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -398,6 +398,7 @@ CONFIG_MMC_DW_EXYNOS=y
CONFIG_MMC_DW_K3=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SUNXI=y
+CONFIG_MMC_BCM2835=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y