summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-01 08:03:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-01 08:03:09 -0700
commitd9244b5d2fbfe9fa540024b410047af13ceec90f (patch)
treed0fd7ce9146e89685d7fe2ee543450df83a0024f
parent65039a31f4e44630f96f1b602c43cc8ad180d4fe (diff)
parentd54d462472a16fc07adb53a2fcd6c0c2a9a8dd1d (diff)
downloadop-kernel-dev-d9244b5d2fbfe9fa540024b410047af13ceec90f.zip
op-kernel-dev-d9244b5d2fbfe9fa540024b410047af13ceec90f.tar.gz
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()
-rw-r--r--Documentation/hwmon/sysfs-interface6
-rw-r--r--drivers/hwmon/lm78.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 2f10ce6..004ee16 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -150,6 +150,11 @@ fan[1-*]_min Fan minimum value
Unit: revolution/min (RPM)
RW
+fan[1-*]_max Fan maximum value
+ Unit: revolution/min (RPM)
+ Only rarely supported by the hardware.
+ RW
+
fan[1-*]_input Fan input value.
Unit: revolution/min (RPM)
RO
@@ -390,6 +395,7 @@ OR
in[0-*]_min_alarm
in[0-*]_max_alarm
fan[1-*]_min_alarm
+fan[1-*]_max_alarm
temp[1-*]_min_alarm
temp[1-*]_max_alarm
temp[1-*]_crit_alarm
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index b5e3b28..a1787fd 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),
};
OpenPOWER on IntegriCloud