Merge tag 'asoc-v3.15-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.15

A smattering of device specific fixes, nothing stands out here except
for the multiplatform fixes for Samsung and the device IDs being added
by Stephen Warren - there's no real code changes from those and they
give better robustness to the enumeration with DT.

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 0a9b44c940ce..048ead967199 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1211,10 +1211,10 @@ static int samsung_i2s_probe(struct platform_device *pdev)
         pri_dai->dma_playback.dma_addr = regs_base + I2STXD;
         pri_dai->dma_capture.dma_addr = regs_base + I2SRXD;
         pri_dai->dma_playback.client =
-                (struct s3c2410_dma_client *)&pri_dai->dma_playback;
+                (struct s3c_dma_client *)&pri_dai->dma_playback;
         pri_dai->dma_playback.ch_name = "tx";
         pri_dai->dma_capture.client =
-                (struct s3c2410_dma_client *)&pri_dai->dma_capture;
+                (struct s3c_dma_client *)&pri_dai->dma_capture;
         pri_dai->dma_capture.ch_name = "rx";
         pri_dai->dma_playback.dma_size = 4;
         pri_dai->dma_capture.dma_size = 4;
@@ -1233,7 +1233,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 }
                 sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
                 sec_dai->dma_playback.client =
-                        (struct s3c2410_dma_client *)&sec_dai->dma_playback;
+                        (struct s3c_dma_client *)&sec_dai->dma_playback;
                 sec_dai->dma_playback.ch_name = "tx-sec";
 
                 if (!np) {