From: Andrew Morton <akpm@linux-foundation.org>

drivers/rtc/rtc-stk17ta8.c:296: warning: initialization from incompatible pointer type
drivers/rtc/rtc-stk17ta8.c:297: warning: initialization from incompatible pointer type

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/rtc/rtc-stk17ta8.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff -puN drivers/rtc/rtc-stk17ta8.c~rtc-stk17ta8-update-for-sysfs-api-change drivers/rtc/rtc-stk17ta8.c
--- a/drivers/rtc/rtc-stk17ta8.c~rtc-stk17ta8-update-for-sysfs-api-change
+++ a/drivers/rtc/rtc-stk17ta8.c
@@ -258,8 +258,9 @@ static const struct rtc_class_ops stk17t
 	.ioctl		= stk17ta8_rtc_ioctl,
 };
 
-static ssize_t stk17ta8_nvram_read(struct kobject *kobj, char *buf,
-				 loff_t pos, size_t size)
+static ssize_t stk17ta8_nvram_read(struct kobject *kobj,
+		struct bin_attribute *bin_attr, char *buf, loff_t pos,
+		size_t size)
 {
 	struct platform_device *pdev =
 		to_platform_device(container_of(kobj, struct device, kobj));
@@ -272,8 +273,9 @@ static ssize_t stk17ta8_nvram_read(struc
 	return count;
 }
 
-static ssize_t stk17ta8_nvram_write(struct kobject *kobj, char *buf,
-				  loff_t pos, size_t size)
+static ssize_t stk17ta8_nvram_write(struct kobject *kobj,
+		struct bin_attribute *bin_attr, char *buf, loff_t pos,
+		size_t size)
 {
 	struct platform_device *pdev =
 		to_platform_device(container_of(kobj, struct device, kobj));
_