Merge branch 'for-3.0' into for-3.1

This commit is contained in:
Mark Brown
2011-06-06 12:26:02 +01:00
7576 changed files with 452426 additions and 379894 deletions

View File

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