Merge branch 'for-3.0' into for-3.1
This commit is contained in:
@@ -205,7 +205,7 @@ static struct snd_soc_dai_driver davinci_vcif_dai = {
|
||||
|
||||
static int davinci_vcif_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct davinci_vc *davinci_vc = mfd_get_data(pdev);
|
||||
struct davinci_vc *davinci_vc = pdev->dev.platform_data;
|
||||
struct davinci_vcif_dev *davinci_vcif_dev;
|
||||
int ret;
|
||||
|
||||
|
Reference in New Issue
Block a user