diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-05-24 16:26:17 -0700 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-24 16:26:17 -0700 |
| commit | 048001ca1f0b503d393509996c28c80fb4e47de3 (patch) | |
| tree | 40fc4ff46a63796c73ed730b0dbfe2a8d2d30c30 /drivers | |
| parent | 6382ec632a37e8ca1d4e21088927e7c9e03eae0b (diff) | |
| parent | c7c9fec5ac486b7978d027bec85b97fa01f13275 (diff) | |
Merge remote branch 'dwalker/msm-mmc_sdcc' into for-next
Diffstat (limited to 'drivers')
| -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 2e13b94769fd..c12deda4930e 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -237,7 +237,7 @@ config MMC_IMX config MMC_MSM7X00A tristate "Qualcomm MSM 7X00A SDCC Controller Support" - depends on MMC && ARCH_MSM + depends on MMC && ARCH_MSM && !ARCH_MSM7X30 help This provides support for the SD/MMC cell found in the MSM 7X00A controllers from Qualcomm. |