From d8afd6c58126bd0e606e673ecf54aaa35b292347 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Wed, 18 Aug 2010 10:53:05 -0700 Subject: [PATCH] --- yaml --- r: 212615 b: refs/heads/master c: 4ca06de368ddfaee47983d3d1f9eec9e2a6c23d4 h: refs/heads/master i: 212613: cef52becc209b4d2354bd88bfbfa5e2308bf9a57 212611: 486c005d3108ddaf63bfbce9e6c2b1ca3e6fb4d0 212607: 4b371249f85c5f2f56f7c76caafe1daf063bc487 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-msm/include/mach/dma.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 552d711a147b..85f09313da7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 871c94a8612f6b13193752c765617cfe68a038d3 +refs/heads/master: 4ca06de368ddfaee47983d3d1f9eec9e2a6c23d4 diff --git a/trunk/arch/arm/mach-msm/include/mach/dma.h b/trunk/arch/arm/mach-msm/include/mach/dma.h index 00f9bbfadbe6..05583f569524 100644 --- a/trunk/arch/arm/mach-msm/include/mach/dma.h +++ b/trunk/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))