diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 17:03:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 17:03:09 +0200 |
commit | d9244b5d2fbfe9fa540024b410047af13ceec90f (patch) | |
tree | d0fd7ce9146e89685d7fe2ee543450df83a0024f /drivers | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | hwmon: Update documentation on fan_max (diff) | |
download | linux-d9244b5d2fbfe9fa540024b410047af13ceec90f.tar.xz linux-d9244b5d2fbfe9fa540024b410047af13ceec90f.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Update documentation on fan_max
hwmon: (lm78) Add missing __devexit_p()
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/lm78.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index b5e3b2851698..a1787fdf5b9f 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c @@ -182,7 +182,7 @@ static struct platform_driver lm78_isa_driver = { .name = "lm78", }, .probe = lm78_isa_probe, - .remove = lm78_isa_remove, + .remove = __devexit_p(lm78_isa_remove), }; |