diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 21:47:44 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 21:47:44 -0400 |
| commit | 15893fb565921507da80e500d85bb2575989bb57 (patch) | |
| tree | 16473cd98b2b4dd43f55d4880a7b42973f2f6bd0 /drivers/mmc | |
| parent | f32154c9b580f11017b01bf093514c900c09364e (diff) | |
| parent | 96987d96f0058d8689a2b8ac288dbff2e6d85563 (diff) | |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 432ae8358c86..e04b751680d0 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
| @@ -329,7 +329,7 @@ config MMC_SDRICOH_CS | |||
| 329 | 329 | ||
| 330 | config MMC_TMIO | 330 | config MMC_TMIO |
| 331 | tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" | 331 | tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" |
| 332 | depends on MFD_TMIO || MFD_ASIC3 | 332 | depends on MFD_TMIO || MFD_ASIC3 || SUPERH |
| 333 | help | 333 | help |
| 334 | This provides support for the SD/MMC cell found in TC6393XB, | 334 | This provides support for the SD/MMC cell found in TC6393XB, |
| 335 | T7L66XB and also HTC ASIC3 | 335 | T7L66XB and also HTC ASIC3 |