From 21200c3627ed24e1ac8c9f9a2782801f805c9b84 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 26 Jul 2007 17:32:49 +0100 Subject: [PATCH] --- yaml --- r: 62942 b: refs/heads/master c: c98dbe59ae4da701f81ba16eb02c94ed85e663c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-stk17ta8.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a6dde5337cd3..0d3a058f81e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be03e56b777362a70f29399aaff9989fc3f3de63 +refs/heads/master: c98dbe59ae4da701f81ba16eb02c94ed85e663c7 diff --git a/trunk/drivers/rtc/rtc-stk17ta8.c b/trunk/drivers/rtc/rtc-stk17ta8.c index f10d3facecbe..8288b6b2bf2b 100644 --- a/trunk/drivers/rtc/rtc-stk17ta8.c +++ b/trunk/drivers/rtc/rtc-stk17ta8.c @@ -258,7 +258,8 @@ static const struct rtc_class_ops stk17ta8_rtc_ops = { .ioctl = stk17ta8_rtc_ioctl, }; -static ssize_t stk17ta8_nvram_read(struct kobject *kobj, char *buf, +static ssize_t stk17ta8_nvram_read(struct kobject *kobj, + struct bin_attribute *attr, char *buf, loff_t pos, size_t size) { struct platform_device *pdev = @@ -272,7 +273,8 @@ static ssize_t stk17ta8_nvram_read(struct kobject *kobj, char *buf, return count; } -static ssize_t stk17ta8_nvram_write(struct kobject *kobj, char *buf, +static ssize_t stk17ta8_nvram_write(struct kobject *kobj, + struct bin_attribute *attr, char *buf, loff_t pos, size_t size) { struct platform_device *pdev =