OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b3d54a
)
git-battery vs git-acpi
author
Andrew Morton
<akpm@linux-foundation.org>
Sun, 15 Jul 2007 18:37:03 +0000
(22:37 +0400)
committer
Anton Vorontsov
<cbou@mail.ru>
Sun, 15 Jul 2007 18:37:03 +0000
(22:37 +0400)
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>
drivers/w1/slaves/w1_ds2760.c
patch
|
blob
|
history
diff --git
a/drivers/w1/slaves/w1_ds2760.c
b/drivers/w1/slaves/w1_ds2760.c
index
15e7f9a
..
ed6b057
100644
(file)
--- 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);