diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 14:10:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 14:10:34 -0700 |
| commit | 750e06992d49666a7589aac555eb3bb68e4dbb88 (patch) | |
| tree | 7ee3d85adf256491dae89e5b049bb28ef1a1680c /drivers/hwmon/sht15.c | |
| parent | d3ec4844d449cf7af9e749f73ba2052fb7b72fc2 (diff) | |
| parent | 156e2d1adc03e17f18f98d297f7757fc6d93a589 (diff) | |
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: (lm78) Become the maintainer
hwmon: (lm78) Make ISA interface depend on CONFIG_ISA
hwmon: (lm78) Avoid forward declarations
hwmon: (sht15) Correct a comment mistake
hwmon: (max1111) Avoid extra memory allocations
hwmon: (it87) Add chassis intrusion detection support
hwmon: (via-cputemp) Add VID reporting support
hwmon-vid: Add support for VIA family 6 model D CPU
hwmon: New driver sch5636
hwmon: (sch5627) Factor out some code shared with sch5636 driver
Diffstat (limited to 'drivers/hwmon/sht15.c')
| -rw-r--r-- | drivers/hwmon/sht15.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index cf4330b352e..7d231cf5d2c 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -671,7 +671,7 @@ static ssize_t sht15_show_status(struct device *dev, * @buf: sysfs buffer to read the new heater state from. * @count: length of the data. * - * Will be called on read access to heater_enable sysfs attribute. + * Will be called on write access to heater_enable sysfs attribute. * Returns number of bytes actually decoded, negative errno on error. */ static ssize_t sht15_store_heater(struct device *dev, |