diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 12:08:14 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 12:08:14 +0200 |
| commit | 828fa1e60117535d9b1e1b09444842ae66e8424d (patch) | |
| tree | 281f5bff9a12c760ca947a98569df63c8ca85909 /drivers/mfd/asic3.c | |
| parent | 09fd86780bb4603df1886e17127f5beb97f70ffb (diff) | |
| parent | 8a105ca202b1a1061a24f1e980206cd2808e2f8b (diff) | |
Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/asic3.c')
| -rw-r--r-- | drivers/mfd/asic3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 9532f749412..fa22154c84e 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -952,7 +952,7 @@ static void asic3_mfd_remove(struct platform_device *pdev) /* Core */ static int __init asic3_probe(struct platform_device *pdev) { - struct asic3_platform_data *pdata = pdev->dev.platform_data; + struct asic3_platform_data *pdata = dev_get_platdata(&pdev->dev); struct asic3 *asic; struct resource *mem; unsigned long clksel; |