diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /drivers/rtc/rtc-ds1553.c | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'drivers/rtc/rtc-ds1553.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1553.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index 244f9994bcbb..ff432e2ca275 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
| @@ -252,7 +252,7 @@ static const struct rtc_class_ops ds1553_rtc_ops = { | |||
| 252 | .update_irq_enable = ds1553_rtc_update_irq_enable, | 252 | .update_irq_enable = ds1553_rtc_update_irq_enable, |
| 253 | }; | 253 | }; |
| 254 | 254 | ||
| 255 | static ssize_t ds1553_nvram_read(struct kobject *kobj, | 255 | static ssize_t ds1553_nvram_read(struct file *filp, struct kobject *kobj, |
| 256 | struct bin_attribute *bin_attr, | 256 | struct bin_attribute *bin_attr, |
| 257 | char *buf, loff_t pos, size_t size) | 257 | char *buf, loff_t pos, size_t size) |
| 258 | { | 258 | { |
| @@ -267,7 +267,7 @@ static ssize_t ds1553_nvram_read(struct kobject *kobj, | |||
| 267 | return count; | 267 | return count; |
| 268 | } | 268 | } |
| 269 | 269 | ||
| 270 | static ssize_t ds1553_nvram_write(struct kobject *kobj, | 270 | static ssize_t ds1553_nvram_write(struct file *filp, struct kobject *kobj, |
| 271 | struct bin_attribute *bin_attr, | 271 | struct bin_attribute *bin_attr, |
| 272 | char *buf, loff_t pos, size_t size) | 272 | char *buf, loff_t pos, size_t size) |
| 273 | { | 273 | { |