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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-m48t59.c
diff --git
a/drivers/rtc/rtc-m48t59.c
b/drivers/rtc/rtc-m48t59.c
index
365ff3a
..
be8359f
100644
(file)
--- a/
drivers/rtc/rtc-m48t59.c
+++ b/
drivers/rtc/rtc-m48t59.c
@@
-343,7
+343,7
@@
static const struct rtc_class_ops m48t02_rtc_ops = {
.set_time = m48t59_rtc_set_time,
};
.set_time = m48t59_rtc_set_time,
};
-static ssize_t m48t59_nvram_read(struct kobject *kobj,
+static ssize_t m48t59_nvram_read(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{
@@
-363,7
+363,7
@@
static ssize_t m48t59_nvram_read(struct kobject *kobj,
return cnt;
}
return cnt;
}
-static ssize_t m48t59_nvram_write(struct kobject *kobj,
+static ssize_t m48t59_nvram_write(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{