diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-15 20:37:03 +0200 |
|---|---|---|
| committer | Anton Vorontsov <cbou@mail.ru> | 2007-07-15 20:37:03 +0200 |
| commit | 0909fca51346d0ece688532c54d41ebc986aef7f (patch) | |
| tree | f5d1192b25eac7e6b691ecc99c8d18543587c9c1 /drivers/w1 | |
| parent | Power supply class and drivers: remove non obligatory return statements (diff) | |
| download | linux-0909fca51346d0ece688532c54d41ebc986aef7f.tar.xz linux-0909fca51346d0ece688532c54d41ebc986aef7f.zip | |
git-battery vs git-acpi
drivers/w1/slaves/w1_ds2760.c:85: warning: initialization from incompatible pointer type
The ACPI guys changed the bin_attr APIs
(commit 91a6902958f052358899f58683d44e36228d85c2)
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/slaves/w1_ds2760.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index 15e7f9af3bc3..ed6b0576208c 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c @@ -68,8 +68,9 @@ int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count) return w1_ds2760_io(dev, buf, addr, count, 1); } -static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off, - size_t count) +static ssize_t w1_ds2760_read_bin(struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t off, size_t count) { struct device *dev = container_of(kobj, struct device, kobj); return w1_ds2760_read(dev, buf, off, count); |