diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
| commit | e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch) | |
| tree | 37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /sound/soc/fsl/mpc5200_dma.c | |
| parent | 7ac03db84baa204d7d280401ed65842541ed1078 (diff) | |
| parent | 56385a12d9bb9e173751f74b6c430742018cafc0 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/soc/fsl/mpc5200_dma.c')
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index 1d4e7164e80a..3dcd1469f283 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -369,7 +369,7 @@ struct snd_soc_platform mpc5200_audio_dma_platform = { }; EXPORT_SYMBOL_GPL(mpc5200_audio_dma_platform); -int mpc5200_audio_dma_create(struct of_device *op) +int mpc5200_audio_dma_create(struct platform_device *op) { phys_addr_t fifo; struct psc_dma *psc_dma; @@ -488,7 +488,7 @@ out_unmap: } EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create); -int mpc5200_audio_dma_destroy(struct of_device *op) +int mpc5200_audio_dma_destroy(struct platform_device *op) { struct psc_dma *psc_dma = dev_get_drvdata(&op->dev); |