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>

authored by Andrew Morton and committed by Anton Vorontsov 0909fca5 7b3d54a8

+3 -2
+3 -2
drivers/w1/slaves/w1_ds2760.c
··· 68 return w1_ds2760_io(dev, buf, addr, count, 1); 69 } 70 71 - static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off, 72 - size_t count) 73 { 74 struct device *dev = container_of(kobj, struct device, kobj); 75 return w1_ds2760_read(dev, buf, off, count);
··· 68 return w1_ds2760_io(dev, buf, addr, count, 1); 69 } 70 71 + static ssize_t w1_ds2760_read_bin(struct kobject *kobj, 72 + struct bin_attribute *bin_attr, 73 + char *buf, loff_t off, size_t count) 74 { 75 struct device *dev = container_of(kobj, struct device, kobj); 76 return w1_ds2760_read(dev, buf, off, count);