Merge branch 'topic/hda' into for-linus

[deliverable/linux.git] / sound / soc / s3c24xx / s3c-i2s-v2.h

diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h
index f66854a77fb225c880cf172501a4c56456356eb2..ecf8eaaed1db7a4c61e561c831a186d5b6a3c6e2 100644 (file)
--- a/sound/soc/s3c24xx/s3c-i2s-v2.h
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.h
@@ -49,8 +49,8 @@ struct s3c_i2sv2_info {
 
        unsigned char    master;
 
-       struct s3c24xx_pcm_dma_params   *dma_playback;
-       struct s3c24xx_pcm_dma_params   *dma_capture;
+       struct s3c_dma_params   *dma_playback;
+       struct s3c_dma_params   *dma_capture;
 
        u32              suspend_iismod;
        u32              suspend_iiscon;