diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-04-08 13:41:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-08 13:51:57 +0200 |
| commit | 71e5222cbea124d737e1fe7de8e255253c12cd29 (patch) | |
| tree | 3a2062d7ca89446e23a97f3b778b49b5537a3d6c /sound/soc/samsung/pcm.c | |
| parent | Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into a... (diff) | |
| download | linux-71e5222cbea124d737e1fe7de8e255253c12cd29.tar.xz linux-71e5222cbea124d737e1fe7de8e255253c12cd29.zip | |
ASoC: samsung: Fix build on multiplatform
PCM and S/PDIF drivers referenced mach headers for a trivial
data structure. This caused build errors on multiplatform builds
as machine headers are not accessible from driver files. Move the data
structure definition to the driver header and remove the dependency.
While at it rename the structure to avoid multiple definition errors
as the same structure is also used by the platform code.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/pcm.c')
| -rw-r--r-- | sound/soc/samsung/pcm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 6a5e4bf6ac96..ab54e297957c 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -20,7 +20,6 @@ #include <sound/pcm_params.h> #include <linux/platform_data/asoc-s3c.h> -#include <mach/dma.h> #include "dma.h" #include "pcm.h" @@ -132,11 +131,11 @@ struct s3c_pcm_info { struct s3c_dma_params *dma_capture; }; -static struct s3c2410_dma_client s3c_pcm_dma_client_out = { +static struct s3c_dma_client s3c_pcm_dma_client_out = { .name = "PCM Stereo out" }; -static struct s3c2410_dma_client s3c_pcm_dma_client_in = { +static struct s3c_dma_client s3c_pcm_dma_client_in = { .name = "PCM Stereo in" }; |