diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 12:45:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 12:45:46 -0400 |
| commit | 9aad9c0d939e97c144388630a2d3f6918e61f672 (patch) | |
| tree | 1ec4b87f49cfe19fc4b8a91622a576f357a6175c /drivers | |
| parent | e411f2dda48c81c556c802d4430717950cf088fd (diff) | |
| parent | f3d56144c86beb25c7d206efa66d6efba908371c (diff) | |
Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
mmc: msm: fix compile error on MSM7x30
msm: dma: add completion.h header
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 e171e77f6129..f06d06e7fdfa 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
| @@ -249,7 +249,7 @@ config MMC_IMX | |||
| 249 | 249 | ||
| 250 | config MMC_MSM7X00A | 250 | config MMC_MSM7X00A |
| 251 | tristate "Qualcomm MSM 7X00A SDCC Controller Support" | 251 | tristate "Qualcomm MSM 7X00A SDCC Controller Support" |
| 252 | depends on MMC && ARCH_MSM | 252 | depends on MMC && ARCH_MSM && !ARCH_MSM7X30 |
| 253 | help | 253 | help |
| 254 | This provides support for the SD/MMC cell found in the | 254 | This provides support for the SD/MMC cell found in the |
| 255 | MSM 7X00A controllers from Qualcomm. | 255 | MSM 7X00A controllers from Qualcomm. |