Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[mv-sheeva.git] / sound / soc / fsl / mpc5200_psc_i2s.c

diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 676841cbae9895a21fbcc15aa34ddef0a8c27c96..534f04cb15d7d1df602b4d8a3e65c962d93ad845 100644 (file)
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(psc_i2s_dai);
  * - Probe/remove operations
  * - OF device match table
  */
-static int __devinit psc_i2s_of_probe(struct of_device *op,
+static int __devinit psc_i2s_of_probe(struct platform_device *op,
                                      const struct of_device_id *match)
 {
        int rc;
@@ -205,7 +205,7 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
 
 }
 
-static int __devexit psc_i2s_of_remove(struct of_device *op)
+static int __devexit psc_i2s_of_remove(struct platform_device *op)
 {
        return mpc5200_audio_dma_destroy(op);
 }