diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 05:03:41 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 05:03:41 -0400 |
| commit | e1c98a27208268dd0484218dd74706ec832cd0d2 (patch) | |
| tree | 5966bdf76ff8711a2133824d015ffce68f754ebd | |
| parent | 06d215719653affcd3b75698dc63e8144804f06f (diff) | |
| parent | 1aaf0f47350ef912dd65d58cd94d4976b02e78c7 (diff) | |
Merge tag 'arm-soc/for-4.12/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64
Pull "Broadcom defconfig-arm64 changes for 4.12" from Florian Fainelli:
This pull request contains Broadcom ARM64-based SoCs defconfig updates for
4.12, please pull the following:
- Gerd enables the BCM2835 MMC driver which yields better performance than the
default one (iProc)
* tag 'arm-soc/for-4.12/defconfig-arm64' of http://github.com/Broadcom/stblinux:
arm64: set CONFIG_MMC_BCM2835=y in defconfig
| -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 fa9ee9e85e5e..ab4461b6b226 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig | |||
| @@ -402,6 +402,7 @@ CONFIG_MMC_DW_EXYNOS=y | |||
| 402 | CONFIG_MMC_DW_K3=y | 402 | CONFIG_MMC_DW_K3=y |
| 403 | CONFIG_MMC_DW_ROCKCHIP=y | 403 | CONFIG_MMC_DW_ROCKCHIP=y |
| 404 | CONFIG_MMC_SUNXI=y | 404 | CONFIG_MMC_SUNXI=y |
| 405 | CONFIG_MMC_BCM2835=y | ||
| 405 | CONFIG_NEW_LEDS=y | 406 | CONFIG_NEW_LEDS=y |
| 406 | CONFIG_LEDS_CLASS=y | 407 | CONFIG_LEDS_CLASS=y |
| 407 | CONFIG_LEDS_GPIO=y | 408 | CONFIG_LEDS_GPIO=y |