diff options
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
-rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index c153699d0f84..61400f04015e 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
@@ -51,8 +51,10 @@ | |||
51 | static int do_probe( struct i2c_adapter *adapter, int addr, int kind); | 51 | static int do_probe( struct i2c_adapter *adapter, int addr, int kind); |
52 | 52 | ||
53 | /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ | 53 | /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ |
54 | static unsigned short normal_i2c[] = { 0x49, 0x2c, I2C_CLIENT_END }; | 54 | static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, |
55 | static unsigned short normal_i2c_range[] = { 0x48, 0x4f, 0x2c, 0x2f, I2C_CLIENT_END }; | 55 | 0x4c, 0x4d, 0x4e, 0x4f, |
56 | 0x2c, 0x2d, 0x2e, 0x2f, | ||
57 | I2C_CLIENT_END }; | ||
56 | 58 | ||
57 | I2C_CLIENT_INSMOD; | 59 | I2C_CLIENT_INSMOD; |
58 | 60 | ||
@@ -107,13 +109,13 @@ print_temp( const char *s, int temp ) | |||
107 | } | 109 | } |
108 | 110 | ||
109 | static ssize_t | 111 | static ssize_t |
110 | show_cpu_temperature( struct device *dev, char *buf ) | 112 | show_cpu_temperature( struct device *dev, struct device_attribute *attr, char *buf ) |
111 | { | 113 | { |
112 | return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 ); | 114 | return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 ); |
113 | } | 115 | } |
114 | 116 | ||
115 | static ssize_t | 117 | static ssize_t |
116 | show_case_temperature( struct device *dev, char *buf ) | 118 | show_case_temperature( struct device *dev, struct device_attribute *attr, char *buf ) |
117 | { | 119 | { |
118 | return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 ); | 120 | return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 ); |
119 | } | 121 | } |