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
/
misc
/
eeprom
/
at24.c
diff --git
a/drivers/misc/eeprom/at24.c
b/drivers/misc/eeprom/at24.c
index
0c11e41
..
f7ca3a4
100644
(file)
--- a/
drivers/misc/eeprom/at24.c
+++ b/
drivers/misc/eeprom/at24.c
@@
-299,7
+299,8
@@
static ssize_t at24_read(struct at24_data *at24,
return retval;
}
return retval;
}
-static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *attr,
char *buf, loff_t off, size_t count)
{
struct at24_data *at24;
char *buf, loff_t off, size_t count)
{
struct at24_data *at24;
@@
-420,7
+421,8
@@
static ssize_t at24_write(struct at24_data *at24, const char *buf, loff_t off,
return retval;
}
return retval;
}
-static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *attr,
char *buf, loff_t off, size_t count)
{
struct at24_data *at24;
char *buf, loff_t off, size_t count)
{
struct at24_data *at24;