Commit d7b96ca5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixlet from Guenter Roeck:
 "Fix fallout from __devexit removal"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (twl4030-madc-hwmon) Fix warning message caused by removal of __devexit
parents 5b3040a4 7764b528
...@@ -130,7 +130,7 @@ static int twl4030_madc_hwmon_remove(struct platform_device *pdev) ...@@ -130,7 +130,7 @@ static int twl4030_madc_hwmon_remove(struct platform_device *pdev)
static struct platform_driver twl4030_madc_hwmon_driver = { static struct platform_driver twl4030_madc_hwmon_driver = {
.probe = twl4030_madc_hwmon_probe, .probe = twl4030_madc_hwmon_probe,
.remove = __exit_p(twl4030_madc_hwmon_remove), .remove = twl4030_madc_hwmon_remove,
.driver = { .driver = {
.name = "twl4030_madc_hwmon", .name = "twl4030_madc_hwmon",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment