diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:41:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:41:19 -0700 |
| commit | ef1c5339d9413ab57c9b2aa768f3c67485d11acb (patch) | |
| tree | bf9703cd25a0b598350d630447a3a41c5a9cd5b9 /drivers/hwmon/w83781d.c | |
| parent | ed72df448250a6da72b65e7881eb63c5ded3475f (diff) | |
| parent | 68a50b567895ea677645ca3cebc484674123532d (diff) | |
| download | op-kernel-dev-ef1c5339d9413ab57c9b2aa768f3c67485d11acb.zip op-kernel-dev-ef1c5339d9413ab57c9b2aa768f3c67485d11acb.tar.gz | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (smsc47m1) restore missing name attribute
hwmon: (w83627ehf) don't assume bank 0
hwmon: (w83627ehf) read fan_div values during probe
hwmon: fix w83781d temp sensor type setting
Diffstat (limited to 'drivers/hwmon/w83781d.c')
| -rw-r--r-- | drivers/hwmon/w83781d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index f85b48f..c95909c 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c @@ -740,9 +740,9 @@ store_sensor(struct device *dev, struct device_attribute *da, static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR, show_sensor, store_sensor, 0); static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR, - show_sensor, store_sensor, 0); + show_sensor, store_sensor, 1); static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR, - show_sensor, store_sensor, 0); + show_sensor, store_sensor, 2); /* I2C devices get this name attribute automatically, but for ISA devices we must create it by ourselves. */ |
