diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-29 00:38:25 +0300 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-29 00:38:25 +0300 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /sound/soc/s3c24xx/s3c-i2s-v2.h | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
| download | linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.xz | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'sound/soc/s3c24xx/s3c-i2s-v2.h')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h index f66854a77fb2..ecf8eaaed1db 100644 --- 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; |