summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-10-26 10:47:44 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-10-26 10:47:44 +0900
commit15893fb565921507da80e500d85bb2575989bb57 (patch)
tree16473cd98b2b4dd43f55d4880a7b42973f2f6bd0 /drivers/mmc
parentf32154c9b580f11017b01bf093514c900c09364e (diff)
parent96987d96f0058d8689a2b8ac288dbff2e6d85563 (diff)
downloadop-kernel-dev-15893fb565921507da80e500d85bb2575989bb57.zip
op-kernel-dev-15893fb565921507da80e500d85bb2575989bb57.tar.gz
Merge branch 'sh/sdhi-mfd'
Conflicts: arch/sh/boards/mach-ecovec24/setup.c arch/sh/boards/mach-kfr2r09/setup.c
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 432ae83..e04b751 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -329,7 +329,7 @@ config MMC_SDRICOH_CS
config MMC_TMIO
tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
- depends on MFD_TMIO || MFD_ASIC3
+ depends on MFD_TMIO || MFD_ASIC3 || SUPERH
help
This provides support for the SD/MMC cell found in TC6393XB,
T7L66XB and also HTC ASIC3
OpenPOWER on IntegriCloud