alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ASoC: Samsung: Fix build error
@ 2012-08-08  6:04 Sachin Kamat
  2012-08-08 11:09 ` Mark Brown
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Sachin Kamat @ 2012-08-08  6:04 UTC (permalink / raw)
  To: linux-samsung-soc, alsa-devel
  Cc: kgene.kim, broonie, sachin.kamat, patches, sbkim73

Fixes the following build error:
In file included from arch/arm/mach-exynos/include/mach/dma.h:24:0,
		from arch/arm/plat-samsung/include/plat/dma-ops.h:17,
		from arch/arm/plat-samsung/include/plat/dma.h:128,
		from sound/soc/samsung/pcm.c:23:
arch/arm/plat-samsung/include/plat/dma-pl330.h:106:8:
			error: redefinition of ‘struct s3c2410_dma_client’
arch/arm/plat-samsung/include/plat/dma.h:40:8: note: originally defined here
make[3]: *** [sound/soc/samsung/pcm.o] Error 1

Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
---
 sound/soc/samsung/pcm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index b7b2a1f..89b0646 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -20,7 +20,7 @@
 #include <sound/pcm_params.h>
 
 #include <plat/audio.h>
-#include <plat/dma.h>
+#include <mach/dma.h>
 
 #include "dma.h"
 #include "pcm.h"
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2012-08-10 16:58 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-08  6:04 [PATCH] ASoC: Samsung: Fix build error Sachin Kamat
2012-08-08 11:09 ` Mark Brown
2012-08-08 11:33   ` Sachin Kamat
2012-08-08 11:38     ` Kukjin Kim
2012-08-08 11:44       ` Sachin Kamat
2012-08-08 12:18         ` Kukjin Kim
2012-08-08 12:27         ` Kukjin Kim
2012-08-10  5:42           ` Kukjin Kim
2012-08-10  6:03 ` Kukjin Kim
2012-08-10  6:17   ` Sachin Kamat
2012-08-10 16:58 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).