From e1054fc2a06daf377f616c7f33ca94e292011be8 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 16 Sep 2011 00:54:25 +0100
Subject: [PATCH] --- yaml --- r: 270579 b: refs/heads/master c:
 cc2115cbfc63da72890160da01608b3189dd1b74 h: refs/heads/master i:   270577:
 28d9062f0b022f6f675c7441f98709fcf5dbb958   270575:
 6b222dccb96baa42b58045ca34259f2b9f58a2d3 v: v3

---
 [refs]                                   | 2 +-
 trunk/sound/soc/blackfin/bf5xx-ad73311.c | 2 +-
 trunk/sound/soc/kirkwood/kirkwood-i2s.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3eff4b08402f..dd28eaa3a367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f998f257c92216df314610dd5aebc5f5d23e6ec0
+refs/heads/master: cc2115cbfc63da72890160da01608b3189dd1b74
diff --git a/trunk/sound/soc/blackfin/bf5xx-ad73311.c b/trunk/sound/soc/blackfin/bf5xx-ad73311.c
index 732a247f2527..b94eb7ef7d16 100644
--- a/trunk/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/trunk/sound/soc/blackfin/bf5xx-ad73311.c
@@ -128,7 +128,7 @@ static int snd_ad73311_configure(void)
 	return 0;
 }
 
-static int bf5xx_probe(struct platform_device *pdev)
+static int bf5xx_probe(struct snd_soc_card *card)
 {
 	int err;
 	if (gpio_request(GPIO_SE, "AD73311_SE")) {
diff --git a/trunk/sound/soc/kirkwood/kirkwood-i2s.c b/trunk/sound/soc/kirkwood/kirkwood-i2s.c
index 8f16cd37c2af..d0bcf3fcea01 100644
--- a/trunk/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/trunk/sound/soc/kirkwood/kirkwood-i2s.c
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 	if (!priv->mem) {
 		dev_err(&pdev->dev, "request_mem_region failed\n");
 		err = -EBUSY;
-		goto error_alloc;
+		goto err_alloc;
 	}
 
 	priv->io = ioremap(priv->mem->start, SZ_16K);