diff options
| -rw-r--r-- | Documentation/hwmon/sysfs-interface | 6 | ||||
| -rw-r--r-- | drivers/hwmon/lm78.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index 2f10ce6a879f..004ee161721e 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
| @@ -150,6 +150,11 @@ fan[1-*]_min Fan minimum value | |||
| 150 | Unit: revolution/min (RPM) | 150 | Unit: revolution/min (RPM) |
| 151 | RW | 151 | RW |
| 152 | 152 | ||
| 153 | fan[1-*]_max Fan maximum value | ||
| 154 | Unit: revolution/min (RPM) | ||
| 155 | Only rarely supported by the hardware. | ||
| 156 | RW | ||
| 157 | |||
| 153 | fan[1-*]_input Fan input value. | 158 | fan[1-*]_input Fan input value. |
| 154 | Unit: revolution/min (RPM) | 159 | Unit: revolution/min (RPM) |
| 155 | RO | 160 | RO |
| @@ -390,6 +395,7 @@ OR | |||
| 390 | in[0-*]_min_alarm | 395 | in[0-*]_min_alarm |
| 391 | in[0-*]_max_alarm | 396 | in[0-*]_max_alarm |
| 392 | fan[1-*]_min_alarm | 397 | fan[1-*]_min_alarm |
| 398 | fan[1-*]_max_alarm | ||
| 393 | temp[1-*]_min_alarm | 399 | temp[1-*]_min_alarm |
| 394 | temp[1-*]_max_alarm | 400 | temp[1-*]_max_alarm |
| 395 | temp[1-*]_crit_alarm | 401 | temp[1-*]_crit_alarm |
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 = { | |||
| 182 | .name = "lm78", | 182 | .name = "lm78", |
| 183 | }, | 183 | }, |
| 184 | .probe = lm78_isa_probe, | 184 | .probe = lm78_isa_probe, |
| 185 | .remove = lm78_isa_remove, | 185 | .remove = __devexit_p(lm78_isa_remove), |
| 186 | }; | 186 | }; |
| 187 | 187 | ||
| 188 | 188 | ||
