projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-tx4939.c
diff --git
a/drivers/rtc/rtc-tx4939.c
b/drivers/rtc/rtc-tx4939.c
index
20bfc64
..
ec6313d
100644
(file)
--- a/
drivers/rtc/rtc-tx4939.c
+++ b/
drivers/rtc/rtc-tx4939.c
@@
-188,7
+188,7
@@
static const struct rtc_class_ops tx4939_rtc_ops = {
.alarm_irq_enable = tx4939_rtc_alarm_irq_enable,
};
.alarm_irq_enable = tx4939_rtc_alarm_irq_enable,
};
-static ssize_t tx4939_rtc_nvram_read(struct kobject *kobj,
+static ssize_t tx4939_rtc_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)
{
@@
-207,7
+207,7
@@
static ssize_t tx4939_rtc_nvram_read(struct kobject *kobj,
return count;
}
return count;
}
-static ssize_t tx4939_rtc_nvram_write(struct kobject *kobj,
+static ssize_t tx4939_rtc_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)
{