aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-06-05 17:14:40 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-06-12 04:51:01 -0400
commit60a549fcda819b69b349a03e6a9300139ab234a9 (patch)
treebafe61504c1091f1ad6c7329b270312da511d155 /drivers/mmc
parentd7fe833f3fc9a02806c96dd28f48e5e28c8484a8 (diff)
mmc: omap: don't select TPS65010
The MMC host driver should not select the pmic driver, since that may have other dependencies, notably i2c in this case. It's not clear what the exact requirement of the driver is, but to preserve the behavior, this patch changes the 'select' into 'depends on', meaning you now have to turn on TPS65010 explicitly and then MMC_OMAP. Found during randconfig build testing. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: linux-omap@vger.kernel.org Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 7fee22432e94..5115445cded1 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -295,7 +295,7 @@ config MMC_MOXART
295config MMC_OMAP 295config MMC_OMAP
296 tristate "TI OMAP Multimedia Card Interface support" 296 tristate "TI OMAP Multimedia Card Interface support"
297 depends on ARCH_OMAP 297 depends on ARCH_OMAP
298 select TPS65010 if MACH_OMAP_H2 298 depends on TPS65010 || !MACH_OMAP_H2
299 help 299 help
300 This selects the TI OMAP Multimedia card Interface. 300 This selects the TI OMAP Multimedia card Interface.
301 If you have an OMAP board with a Multimedia Card slot, 301 If you have an OMAP board with a Multimedia Card slot,