diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/hwmon/w83792d.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/hwmon/w83792d.c')
| -rw-r--r-- | drivers/hwmon/w83792d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 63841f8cec07..f3e7130c4cda 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
| @@ -244,7 +244,7 @@ FAN_TO_REG(long rpm, int div) | |||
| 244 | #define TEMP1_TO_REG(val) (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \ | 244 | #define TEMP1_TO_REG(val) (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \ |
| 245 | : (val)) / 1000, 0, 0xff)) | 245 | : (val)) / 1000, 0, 0xff)) |
| 246 | #define TEMP1_FROM_REG(val) (((val) & 0x80 ? (val)-0x100 : (val)) * 1000) | 246 | #define TEMP1_FROM_REG(val) (((val) & 0x80 ? (val)-0x100 : (val)) * 1000) |
| 247 | /* for temp2 and temp3, because they need addtional resolution */ | 247 | /* for temp2 and temp3, because they need additional resolution */ |
| 248 | #define TEMP_ADD_FROM_REG(val1, val2) \ | 248 | #define TEMP_ADD_FROM_REG(val1, val2) \ |
| 249 | ((((val1) & 0x80 ? (val1)-0x100 \ | 249 | ((((val1) & 0x80 ? (val1)-0x100 \ |
| 250 | : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0)) | 250 | : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0)) |