git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
drivers
/
w1
/
slaves
/
w1_ds2760.c
diff --git
a/drivers/w1/slaves/w1_ds2760.c
b/drivers/w1/slaves/w1_ds2760.c
index
6e15334
..
483d451
100644
(file)
--- a/
drivers/w1/slaves/w1_ds2760.c
+++ b/
drivers/w1/slaves/w1_ds2760.c
@@
-97,7
+97,7
@@
int w1_ds2760_recall_eeprom(struct device *dev, int addr)
return w1_ds2760_eeprom_cmd(dev, addr, W1_DS2760_RECALL_DATA);
}
return w1_ds2760_eeprom_cmd(dev, addr, W1_DS2760_RECALL_DATA);
}
-static ssize_t w1_ds2760_read_bin(struct kobject *kobj,
+static ssize_t w1_ds2760_read_bin(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{