diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-08-08 11:34:43 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-10 18:07:20 +0100 |
| commit | 61f5d61ef94d7082d96494e2a6dd79de2b4437d2 (patch) | |
| tree | 93b826f9c534482094b2d7b3f5c08ef30f05ec94 /sound | |
| parent | 9c30959884261518de46e0b79ac7a902e6ddd147 (diff) | |
| download | linux-61f5d61ef94d7082d96494e2a6dd79de2b4437d2.tar.gz linux-61f5d61ef94d7082d96494e2a6dd79de2b4437d2.tar.bz2 linux-61f5d61ef94d7082d96494e2a6dd79de2b4437d2.zip | |
ASoC: Samsung: Fix build error
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
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | 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 b7b2a1f91425..89b064650f14 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" |