diff options
author | Benjamin LaHaise <bcrl@kvack.org> | 2014-07-14 13:14:27 -0400 |
---|---|---|
committer | Benjamin LaHaise <bcrl@kvack.org> | 2014-07-14 13:14:27 -0400 |
commit | 6e830d53717cf3d5c30c1afce3773ef97e436cd9 (patch) | |
tree | 9376a0424b8f9fff12d107aa2498e775da20e85d /drivers/hwmon/gpio-fan.c | |
parent | 855ef0dec7271ff7be7381feaaf3f4aed80bd503 (diff) | |
parent | 263782c1c95bbddbb022dc092fd89a36bb8d5577 (diff) | |
download | talos-op-linux-6e830d53717cf3d5c30c1afce3773ef97e436cd9.tar.gz talos-op-linux-6e830d53717cf3d5c30c1afce3773ef97e436cd9.zip |
Merge ../aio-fixes
Diffstat (limited to 'drivers/hwmon/gpio-fan.c')
-rw-r--r-- | drivers/hwmon/gpio-fan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c index ba35e4d530b5..2566c43dd1e9 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c @@ -538,7 +538,7 @@ static int gpio_fan_probe(struct platform_device *pdev) /* Make this driver part of hwmon class. */ fan_data->hwmon_dev = hwmon_device_register_with_groups(&pdev->dev, - "gpio-fan", fan_data, + "gpio_fan", fan_data, gpio_fan_groups); if (IS_ERR(fan_data->hwmon_dev)) return PTR_ERR(fan_data->hwmon_dev); |