diff options
| author | Arnd Bergmann | 2021-08-12 23:06:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2021-08-12 23:06:53 +0200 |
| commit | 20904527a70de3aff43edafdf5d18b0f6f976f59 (patch) | |
| tree | 60c323a6600262b91b6c12982d967b526773efe6 /arch/arm/configs | |
| parent | b528dede9bca2afc262b841757fa994bd035cb43 (diff) | |
| parent | c8cec81305463d042d51af946b6b273d8367626e (diff) | |
Merge tag 'amlogic-arm-configs-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/defconfig
Amlogic ARM configs change for v5.15:
- Enable CONFIG_MMC_MESON_MX_SDHC controller used on meson8/8b
* tag 'amlogic-arm-configs-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
ARM: multi_v7_defconfig: Enable CONFIG_MMC_MESON_MX_SDHC
Link: https://lore.kernel.org/r/8e2b5139-86e6-0da3-75c4-d8df66448d51@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -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 bc9ecf28207c..fd79b63ce207 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -871,6 +871,7 @@ CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_SDHCI_SPEAR=y CONFIG_MMC_SDHCI_S3C_DMA=y CONFIG_MMC_SDHCI_BCM_KONA=y +CONFIG_MMC_MESON_MX_SDHC=y CONFIG_MMC_MESON_MX_SDIO=y CONFIG_MMC_SDHCI_ST=y CONFIG_MMC_OMAP=y |