diff options
| author | Olof Johansson <olof@lixom.net> | 2014-06-27 08:10:55 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-06-27 08:26:41 +0200 |
| commit | bfda90cbb8933aa280b22e8ae087e2a850a01288 (patch) | |
| tree | 62a28cdd3a60ef55464354ce994ff3dffb185c71 /arch/arm/configs/bcm_defconfig | |
| parent | Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes (diff) | |
| download | linux-bfda90cbb8933aa280b22e8ae087e2a850a01288.tar.xz linux-bfda90cbb8933aa280b22e8ae087e2a850a01288.zip | |
ARM: bcm: Fix bcm and multi_v7 defconfigs
BCM (Kona/capri platform) has regressed in two ways on this release. First,
bcm_defconfig no longer selected the appropriate MMC driver options due to
changes in dependencies. Secondly, the new MFD and regulator drivers were not
enabled on multi_v7_defconfig, so that caused the system to fail probing MMC
there.
Fix by enabling the new options as needed.
Cc: Matt Porter <matt.porter@linaro.org>
Cc: Christian Daudt <bcm@fixthebug.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/bcm_defconfig')
| -rw-r--r-- | arch/arm/configs/bcm_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index 9d13dae99125..4bf72264b175 100644 --- a/arch/arm/configs/bcm_defconfig +++ b/arch/arm/configs/bcm_defconfig @@ -94,10 +94,10 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_TEST=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_BCM_KONA=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y |