summaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-16 00:54:25 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-16 00:54:25 +0100
commitcc2115cbfc63da72890160da01608b3189dd1b74 (patch)
tree6f178677ebeec498ee4c5765adb71e1f90da37c8 /sound/soc/blackfin
parentf998f257c92216df314610dd5aebc5f5d23e6ec0 (diff)
parent4f6c7e159361b330d767b107226bcc6938abad16 (diff)
downloadlinux-cc2115cbfc63da72890160da01608b3189dd1b74.tar.bz2
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/blackfin')
-rw-r--r--sound/soc/blackfin/bf5xx-ad73311.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
index 732a247f2527..b94eb7ef7d16 100644
--- a/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/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")) {