Commit 9aad9c0d authored by Linus Torvalds's avatar Linus Torvalds

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
parents e411f2dd f3d56144
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/completion.h>
#include <mach/dma.h> #include <mach/dma.h>
#define MSM_DMOV_CHANNEL_COUNT 16 #define MSM_DMOV_CHANNEL_COUNT 16
......
...@@ -249,7 +249,7 @@ config MMC_IMX ...@@ -249,7 +249,7 @@ config MMC_IMX
config MMC_MSM7X00A config MMC_MSM7X00A
tristate "Qualcomm MSM 7X00A SDCC Controller Support" tristate "Qualcomm MSM 7X00A SDCC Controller Support"
depends on MMC && ARCH_MSM depends on MMC && ARCH_MSM && !ARCH_MSM7X30
help help
This provides support for the SD/MMC cell found in the This provides support for the SD/MMC cell found in the
MSM 7X00A controllers from Qualcomm. MSM 7X00A controllers from Qualcomm.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment