summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 18:45:46 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 18:45:46 +0200
commit9aad9c0d939e97c144388630a2d3f6918e61f672 (patch)
tree1ec4b87f49cfe19fc4b8a91622a576f357a6175c /arch
parentMerge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze (diff)
parentmmc: msm: fix compile error on MSM7x30 (diff)
downloadlinux-9aad9c0d939e97c144388630a2d3f6918e61f672.tar.xz
linux-9aad9c0d939e97c144388630a2d3f6918e61f672.zip
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 'arch')
-rw-r--r--arch/arm/mach-msm/dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index d029d1f5f9e2..02cae5e2951c 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