diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:46:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:46:35 +0200 |
| commit | 4cb6948e5365ab874bb71ac35fb6b7c6dd305765 (patch) | |
| tree | 0af0f44cce9043f3d66b7259536c6c99b790d9b0 /arch/arm/mach-msm/dma.c | |
| parent | 89275d59b572b92b1e2f6ddb63c49deecb801ff9 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
| download | op-kernel-dev-4cb6948e5365ab874bb71ac35fb6b7c6dd305765.zip op-kernel-dev-4cb6948e5365ab874bb71ac35fb6b7c6dd305765.tar.gz | |
Merge commit 'v2.6.35-rc3' into sched/core
Merge reason: Update to the latest -rc.
Diffstat (limited to 'arch/arm/mach-msm/dma.c')
| -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 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 |
