Merge branch 'for-2.6.38' into for-2.6.39

[linux-2.6-block.git] / sound / soc / pxa / zylonite.c

diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 25bba108fea3295295236869c636113a03c76cd5..ac577263b3e3dd7205b7243ae7e434f0aef21575 100644 (file)
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -189,7 +189,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
 },
 };
 
-static int zylonite_probe(struct platform_device *pdev)
+static int zylonite_probe(struct snd_soc_card *card)
 {
        int ret;
 
@@ -216,7 +216,7 @@ static int zylonite_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int zylonite_remove(struct platform_device *pdev)
+static int zylonite_remove(struct snd_soc_card *card)
 {
        if (clk_pout) {
                clk_disable(pout);
@@ -226,8 +226,7 @@ static int zylonite_remove(struct platform_device *pdev)
        return 0;
 }
 
-static int zylonite_suspend_post(struct platform_device *pdev,
-                                pm_message_t state)
+static int zylonite_suspend_post(struct snd_soc_card *card)
 {
        if (clk_pout)
                clk_disable(pout);
@@ -235,7 +234,7 @@ static int zylonite_suspend_post(struct platform_device *pdev,
        return 0;
 }
 
-static int zylonite_resume_pre(struct platform_device *pdev)
+static int zylonite_resume_pre(struct snd_soc_card *card)
 {
        int ret = 0;