diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 19:55:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 19:55:59 +0100 |
| commit | 3c00079b31f910309b30ed5c2fd2b7a2d86bba60 (patch) | |
| tree | fdfa1eff1ac33b9eb8081688d970d7ea04ab88f0 /arch/arm/mach-msm/include/mach/dma.h | |
| parent | 7f9c7e28119cf21ae1a035240da3705647d0d06a (diff) | |
| parent | 88b522771079d7ab5f2334c8271bc13e1d309a5c (diff) | |
| download | kernel_samsung_aries-3c00079b31f910309b30ed5c2fd2b7a2d86bba60.zip kernel_samsung_aries-3c00079b31f910309b30ed5c2fd2b7a2d86bba60.tar.gz kernel_samsung_aries-3c00079b31f910309b30ed5c2fd2b7a2d86bba60.tar.bz2 | |
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
Diffstat (limited to 'arch/arm/mach-msm/include/mach/dma.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/dma.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/include/mach/dma.h b/arch/arm/mach-msm/include/mach/dma.h index 00f9bbf..05583f5 100644 --- a/arch/arm/mach-msm/include/mach/dma.h +++ b/arch/arm/mach-msm/include/mach/dma.h @@ -32,10 +32,18 @@ struct msm_dmov_cmd { void *data; }; +#ifndef CONFIG_ARCH_MSM8X60 void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd); void msm_dmov_stop_cmd(unsigned id, struct msm_dmov_cmd *cmd, int graceful); int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr); - +#else +static inline +void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd) { } +static inline +void msm_dmov_stop_cmd(unsigned id, struct msm_dmov_cmd *cmd, int graceful) { } +static inline +int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr) { return -EIO; } +#endif #define DMOV_SD0(off, ch) (MSM_DMOV_BASE + 0x0000 + (off) + ((ch) << 2)) |