diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-14 15:50:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-14 15:50:19 -0400 |
| commit | 4fa435018d740cb83d74c92306aa1f796da91ddd (patch) | |
| tree | b2b5783837be3d17b65b924b051aeb01e6b1fce9 /include | |
| parent | 7441dd12e607651128e676866630a848b664d6e7 (diff) | |
| parent | a022fef5a2b19086b329d1cc64a5d78aa83e2908 (diff) | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (53 commits)
hwmon: (vt8231) fix sparse warning
hwmon: (sis5595) fix sparse warning
hwmon: (w83627hf) don't assume bank 0
hwmon: (w83627hf) Fix setting fan min right after driver load
hwmon: (w83627hf) De-macro sysfs callback functions
hwmon: Add new combined driver for FSC chips
hwmon: (ibmpex) Release IPMI user if hwmon registration fails
hwmon: (dme1737) Add sch311x support
hwmon: (dme1737) group functions logically
hwmon: (dme1737) cleanups
hwmon: IBM power meter driver
hwmon: (coretemp) Add support for Celeron 4xx
hwmon: (lm87) Disable VID when it should be
hwmon: (w83781d) Add individual alarm and beep files
hwmon: VRM is not read from registers
MAINTAINERS: update hwmon subsystem git trees
hwmon: Fix the code examples in documentation
hwmon: update sysfs interface document - error handling
hwmon: (thmc50) Fix a debug message
hwmon: (thmc50) Don't create temp3 if not enabled
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hwmon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h index 0efd994c37f1..6b6ee702b007 100644 --- a/include/linux/hwmon.h +++ b/include/linux/hwmon.h | |||
| @@ -16,9 +16,9 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 18 | 18 | ||
| 19 | struct class_device *hwmon_device_register(struct device *dev); | 19 | struct device *hwmon_device_register(struct device *dev); |
| 20 | 20 | ||
| 21 | void hwmon_device_unregister(struct class_device *cdev); | 21 | void hwmon_device_unregister(struct device *dev); |
| 22 | 22 | ||
| 23 | /* Scale user input to sensible values */ | 23 | /* Scale user input to sensible values */ |
| 24 | static inline int SENSORS_LIMIT(long value, long low, long high) | 24 | static inline int SENSORS_LIMIT(long value, long low, long high) |