diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 08:43:00 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 08:43:00 -0700 |
| commit | e3c55d406bd8df1a878546002c93db90c42be10c (patch) | |
| tree | efb0ba2707c95fd7166cf1b76887c43c977e37dd /drivers/hwmon/max6639.c | |
| parent | 4d6e482675f13e33599fc3d18fc723959be0a9b6 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were
committed through other trees.
Diffstat (limited to 'drivers/hwmon/max6639.c')
| -rw-r--r-- | drivers/hwmon/max6639.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 3e7b4269f5b9..066e587a18a5 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -428,7 +428,7 @@ static int max6639_init_client(struct i2c_client *client) { struct max6639_data *data = i2c_get_clientdata(client); struct max6639_platform_data *max6639_info = - client->dev.platform_data; + dev_get_platdata(&client->dev); int i; int rpm_range = 1; /* default: 4000 RPM */ int err; |