diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-03-24 13:14:14 -0400 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2017-03-24 13:14:14 -0400 |
| commit | 1aaf0f47350ef912dd65d58cd94d4976b02e78c7 (patch) | |
| tree | 0387092a984b88ae0e38d2fcd0959b42c3eee3cc | |
| parent | c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff) | |
| parent | 3c9d36192802d60fca73c85c7096221371c36be7 (diff) | |
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/defconfig | 1 |
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 | |||
| 398 | CONFIG_MMC_DW_K3=y | 398 | CONFIG_MMC_DW_K3=y |
| 399 | CONFIG_MMC_DW_ROCKCHIP=y | 399 | CONFIG_MMC_DW_ROCKCHIP=y |
| 400 | CONFIG_MMC_SUNXI=y | 400 | CONFIG_MMC_SUNXI=y |
| 401 | CONFIG_MMC_BCM2835=y | ||
| 401 | CONFIG_NEW_LEDS=y | 402 | CONFIG_NEW_LEDS=y |
| 402 | CONFIG_LEDS_CLASS=y | 403 | CONFIG_LEDS_CLASS=y |
| 403 | CONFIG_LEDS_GPIO=y | 404 | CONFIG_LEDS_GPIO=y |