diff --git a/[refs] b/[refs]
index e238430803a7..efbb19f8f08c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d39d0a1947fee4c29976e507fb93188eaa2b38
+refs/heads/master: a84534dc179d3e9f501e5a12598cc5271cd28f5b
diff --git a/trunk/sound/soc/pxa/pxa2xx-ac97.c b/trunk/sound/soc/pxa/pxa2xx-ac97.c
index b458667538cd..059af815ea0c 100644
--- a/trunk/sound/soc/pxa/pxa2xx-ac97.c
+++ b/trunk/sound/soc/pxa/pxa2xx-ac97.c
@@ -356,7 +356,8 @@ static int pxa2xx_ac97_probe(struct platform_device *pdev,
 	return ret;
 }
 
-static void pxa2xx_ac97_remove(struct platform_device *pdev)
+static void pxa2xx_ac97_remove(struct platform_device *pdev,
+			       struct snd_soc_dai *dai)
 {
 	GCR |= GCR_ACLINK_OFF;
 	free_irq(IRQ_AC97, NULL);