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/i2c/chips/smsc47b397.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/i2c/chips/smsc47b397.c')
| -rw-r--r-- | drivers/i2c/chips/smsc47b397.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/chips/smsc47b397.c b/drivers/i2c/chips/smsc47b397.c index 1119c76791d9..251ac2659554 100644 --- a/drivers/i2c/chips/smsc47b397.c +++ b/drivers/i2c/chips/smsc47b397.c | |||
| @@ -172,7 +172,7 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr) | |||
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | #define sysfs_temp(num) \ | 174 | #define sysfs_temp(num) \ |
| 175 | static ssize_t show_temp##num(struct device *dev, char *buf) \ | 175 | static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \ |
| 176 | { \ | 176 | { \ |
| 177 | return show_temp(dev, buf, num-1); \ | 177 | return show_temp(dev, buf, num-1); \ |
| 178 | } \ | 178 | } \ |
| @@ -201,7 +201,7 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr) | |||
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | #define sysfs_fan(num) \ | 203 | #define sysfs_fan(num) \ |
| 204 | static ssize_t show_fan##num(struct device *dev, char *buf) \ | 204 | static ssize_t show_fan##num(struct device *dev, struct device_attribute *attr, char *buf) \ |
| 205 | { \ | 205 | { \ |
| 206 | return show_fan(dev, buf, num-1); \ | 206 | return show_fan(dev, buf, num-1); \ |
| 207 | } \ | 207 | } \ |