diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 16:45:46 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 16:45:46 (GMT) |
| commit | 9aad9c0d939e97c144388630a2d3f6918e61f672 (patch) | |
| tree | 1ec4b87f49cfe19fc4b8a91622a576f357a6175c | |
| parent | e411f2dda48c81c556c802d4430717950cf088fd (diff) | |
| parent | f3d56144c86beb25c7d206efa66d6efba908371c (diff) | |
| download | linux-fsl-qoriq-9aad9c0d939e97c144388630a2d3f6918e61f672.tar.xz | |
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
| -rw-r--r-- | arch/arm/mach-msm/dma.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c index d029d1f..02cae5e 100644 --- a/arch/arm/mach-msm/dma.c +++ b/arch/arm/mach-msm/dma.c @@ -17,6 +17,7 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/interrupt.h> +#include <linux/completion.h> #include <mach/dma.h> #define MSM_DMOV_CHANNEL_COUNT 16 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index e171e77..f06d06e 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -249,7 +249,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. |