Commit:     0909fca51346d0ece688532c54d41ebc986aef7f
Parent:     7b3d54a8c30d2c524889a05d0c1334813d516b93
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 22:37:03 2007 +0400
Committer:  Anton Vorontsov <[EMAIL PROTECTED]>
CommitDate: Sun Jul 15 22:37:03 2007 +0400

    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 <[EMAIL PROTECTED]>
    Cc: Len Brown <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
 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 15e7f9a..ed6b057 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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to