projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin' into master
[linux-2.6-block.git]
/
drivers
/
hwmon
/
lm75.h
diff --git
a/drivers/hwmon/lm75.h
b/drivers/hwmon/lm75.h
index 63e3f2fb4c21dd4ef6b2063a993e4b5f2e237672..7c93454bb4e3eb4d01e482b2475335aa03aafc7e 100644
(file)
--- a/
drivers/hwmon/lm75.h
+++ b/
drivers/hwmon/lm75.h
@@
-25,7
+25,7
@@
which contains this code, we don't worry about the wasted space.
*/
which contains this code, we don't worry about the wasted space.
*/
-#include <linux/
i2c-sensor
.h>
+#include <linux/
hwmon
.h>
/* straight from the datasheet */
#define LM75_TEMP_MIN (-55000)
/* straight from the datasheet */
#define LM75_TEMP_MIN (-55000)
@@
-33,7
+33,7
@@
/* TEMP: 0.001C/bit (-55C to +125C)
REG: (0.5C/bit, two's complement) << 7 */
/* TEMP: 0.001C/bit (-55C to +125C)
REG: (0.5C/bit, two's complement) << 7 */
-static inline u16 LM75_TEMP_TO_REG(
int
temp)
+static inline u16 LM75_TEMP_TO_REG(
long
temp)
{
int ntemp = SENSORS_LIMIT(temp, LM75_TEMP_MIN, LM75_TEMP_MAX);
ntemp += (ntemp<0 ? -250 : 250);
{
int ntemp = SENSORS_LIMIT(temp, LM75_TEMP_MIN, LM75_TEMP_MAX);
ntemp += (ntemp<0 ? -250 : 250);