diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 21:25:44 +0400 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 21:25:44 +0400 |
commit | 3bc4f3993b93dbf1f6402e2034a2e20eb07db807 (patch) | |
tree | 592283e59e121b76355836295d6016fe33cfc5d1 /drivers/hwmon/max197.c | |
parent | 17638db1b88184d8895f3f4551c936d7480a1d3f (diff) | |
parent | cb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e (diff) | |
download | linux-3bc4f3993b93dbf1f6402e2034a2e20eb07db807.tar.xz |
Merge remote branch 'origin/master' into next-merge
Diffstat (limited to 'drivers/hwmon/max197.c')
-rw-r--r-- | drivers/hwmon/max197.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c index b5ebb9198c75..96dccaf919d1 100644 --- a/drivers/hwmon/max197.c +++ b/drivers/hwmon/max197.c @@ -261,7 +261,7 @@ static int max197_probe(struct platform_device *pdev) { int ch, ret; struct max197_data *data; - struct max197_platform_data *pdata = pdev->dev.platform_data; + struct max197_platform_data *pdata = dev_get_platdata(&pdev->dev); enum max197_chips chip = platform_get_device_id(pdev)->driver_data; if (pdata == NULL) { |