diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/macintosh/therm_windtunnel.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index c153699d0f84..0bdb47f08c2a 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -107,13 +107,13 @@ print_temp( const char *s, int temp ) | |||
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | static ssize_t | 109 | static ssize_t |
| 110 | show_cpu_temperature( struct device *dev, char *buf ) | 110 | show_cpu_temperature( struct device *dev, struct device_attribute *attr, char *buf ) |
| 111 | { | 111 | { |
| 112 | return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 ); | 112 | return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 ); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | static ssize_t | 115 | static ssize_t |
| 116 | show_case_temperature( struct device *dev, char *buf ) | 116 | show_case_temperature( struct device *dev, struct device_attribute *attr, char *buf ) |
| 117 | { | 117 | { |
| 118 | return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 ); | 118 | return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 ); |
| 119 | } | 119 | } |