diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:58:30 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:58:30 +0100 |
| commit | 0a02a25856cd05492c748aa15b7fa60941d524e3 (patch) | |
| tree | e627f0a0c1e23c7b532b513f655518766095b7bc /arch/arm | |
| parent | 2a10276cf42536615755a8c4173e593192c5763f (diff) | |
| parent | fce107aea2cbea0d3bc6d170ba6ce14111661a1b (diff) | |
| download | linux-stable-0a02a25856cd05492c748aa15b7fa60941d524e3.tar.gz linux-stable-0a02a25856cd05492c748aa15b7fa60941d524e3.tar.bz2 linux-stable-0a02a25856cd05492c748aa15b7fa60941d524e3.zip | |
Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
Pull "Amlogic: defconfig updates for v4.15" from Kevin Hilman:
- enable SDIO/MMC controller
* tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM: multi_v7_defconfig: enable the Meson MX SDIO/MMC controller
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 708614d11bb4..2adef49d1b24 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -729,6 +729,7 @@ CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_ATMELMCI=y CONFIG_MMC_SDHCI_MSM=y +CONFIG_MMC_MESON_MX_SDIO=y CONFIG_MMC_MVSDIO=y CONFIG_MMC_SDHI=y CONFIG_MMC_DW=y |