diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 18:06:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 18:06:11 -0500 |
| commit | d7b96ca5d08a8f2f836feb2b3b3bd721d2837a8e (patch) | |
| tree | e4700189d9d880489b0aaa69ce6f9ff04f41d12f | |
| parent | 5b3040a48bc9b916dc318bde33c9ebd98f00fbeb (diff) | |
| parent | 7764b5282e7e04ede3020d86787122887840e016 (diff) | |
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
| -rw-r--r-- | drivers/hwmon/twl4030-madc-hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c index 149d44a7c584..6c6d440bb2dd 100644 --- a/drivers/hwmon/twl4030-madc-hwmon.c +++ b/drivers/hwmon/twl4030-madc-hwmon.c | |||
| @@ -130,7 +130,7 @@ static int twl4030_madc_hwmon_remove(struct platform_device *pdev) | |||
| 130 | 130 | ||
| 131 | static struct platform_driver twl4030_madc_hwmon_driver = { | 131 | static struct platform_driver twl4030_madc_hwmon_driver = { |
| 132 | .probe = twl4030_madc_hwmon_probe, | 132 | .probe = twl4030_madc_hwmon_probe, |
| 133 | .remove = __exit_p(twl4030_madc_hwmon_remove), | 133 | .remove = twl4030_madc_hwmon_remove, |
| 134 | .driver = { | 134 | .driver = { |
| 135 | .name = "twl4030_madc_hwmon", | 135 | .name = "twl4030_madc_hwmon", |
| 136 | .owner = THIS_MODULE, | 136 | .owner = THIS_MODULE, |