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 /arch | |
| 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 'arch')
| -rw-r--r-- | arch/arm/mach-msm/dma.c | 1 |
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 @@ | |||
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/completion.h> | ||
| 20 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 21 | 22 | ||
| 22 | #define MSM_DMOV_CHANNEL_COUNT 16 | 23 | #define MSM_DMOV_CHANNEL_COUNT 16 |