From: Stephen Warren Date: Mon, 16 Jun 2014 16:50:42 +0000 (-0600) Subject: ARM: multi_v7_defconfig: re-enable SDHCI drivers X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=216e9d3e8b00424c13ca76ef97d707ddc7f57a8b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ARM: multi_v7_defconfig: re-enable SDHCI drivers Following 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies", SDHCI drivers that use MMC_SDHCI_PLTFM no longer select it, but instead depend on it. This means that multi_v7_defconfig no longer selects it, and hence many SDHCI drivers are no longer enabled. Explicitly enable MMC_SDHCI_PLTFM to solve this. Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies") Signed-off-by: Stephen Warren Tested-by: Matt Porter Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e2d62048e198..17d9462b9fb9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -300,6 +300,7 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_ARMMMCI=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MMC_SDHCI_DOVE=y