Merge branch 'for-3.1' into for-3.2
This commit is contained in:
commit
cc2115cbfc
|
@ -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")) {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue