diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 12:26:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 12:26:02 +0100 |
| commit | aa72f6899b9fb3dc824c458234ae3507a60e462d (patch) | |
| tree | 97480a3cefc3d864ffd6eb994ec09ab5d680eabe /sound/soc/davinci | |
| parent | e6a9be0bb018466896632969ba4b496d1a7caea9 (diff) | |
| parent | 05d3962cc921c51059df69488c7f70ab8b6a5d88 (diff) | |
| download | linux-stable-aa72f6899b9fb3dc824c458234ae3507a60e462d.tar.gz linux-stable-aa72f6899b9fb3dc824c458234ae3507a60e462d.tar.bz2 linux-stable-aa72f6899b9fb3dc824c458234ae3507a60e462d.zip | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/davinci-vcif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 13e05a302a92..9259f1f34899 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -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; |