redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'for-3.1' into for-3.2

Browse source
This commit is contained in:
Mark Brown 2011-09-16 00:54:25 +01:00
parent f998f257c9 4f6c7e1593
commit cc2115cbfc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/blackfin/bf5xx-ad73311.c
View file

@ -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")) {

2
sound/soc/kirkwood/kirkwood-i2s.c
View file

@ -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);