diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 15:06:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 15:06:11 -0800 |
| commit | d7b96ca5d08a8f2f836feb2b3b3bd721d2837a8e (patch) | |
| tree | e4700189d9d880489b0aaa69ce6f9ff04f41d12f | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
| parent | hwmon: (twl4030-madc-hwmon) Fix warning message caused by removal of __devexit (diff) | |
| download | linux-dev-d7b96ca5d08a8f2f836feb2b3b3bd721d2837a8e.tar.xz linux-dev-d7b96ca5d08a8f2f836feb2b3b3bd721d2837a8e.zip | |
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) static struct platform_driver twl4030_madc_hwmon_driver = { .probe = twl4030_madc_hwmon_probe, - .remove = __exit_p(twl4030_madc_hwmon_remove), + .remove = twl4030_madc_hwmon_remove, .driver = { .name = "twl4030_madc_hwmon", .owner = THIS_MODULE, |