aboutsummaryrefslogtreecommitdiff
path: root/drivers/w1/slaves/w1_ds2760.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-07-15 22:37:03 +0400
committerAnton Vorontsov <cbou@mail.ru>2007-07-15 22:37:03 +0400
commit0909fca51346d0ece688532c54d41ebc986aef7f (patch)
treef5d1192b25eac7e6b691ecc99c8d18543587c9c1 /drivers/w1/slaves/w1_ds2760.c
parent7b3d54a8c30d2c524889a05d0c1334813d516b93 (diff)
downloadlinux-2.6.34-ux500-0909fca51346d0ece688532c54d41ebc986aef7f.tar.gz
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/slaves/w1_ds2760.c')
-rw-r--r--drivers/w1/slaves/w1_ds2760.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c
index 15e7f9af3bc..ed6b0576208 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);