From 5c4dc4b852741047a60cb2e0f4c555111da2fdd0 Mon Sep 17 00:00:00 2001
From: Yani Ioannou <yani.ioannou@gmail.com>
Date: Tue, 17 May 2005 06:44:59 -0400
Subject: [PATCH] --- yaml --- r: 2390 b: refs/heads/master c:
 f2d03e1b3f00f1c5971463ab0101bef0c521ad3b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/asm-ppc/ocp.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 52737b6ffc0f..6f50b09fce7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 060b8845e6bea938d65ad6f89e83507e5ff4fec4
+refs/heads/master: f2d03e1b3f00f1c5971463ab0101bef0c521ad3b
diff --git a/trunk/include/asm-ppc/ocp.h b/trunk/include/asm-ppc/ocp.h
index b98db3cdae83..c726f1845190 100644
--- a/trunk/include/asm-ppc/ocp.h
+++ b/trunk/include/asm-ppc/ocp.h
@@ -189,7 +189,7 @@ extern void ocp_for_each_device(void(*callback)(struct ocp_device *, void *arg),
 /* Sysfs support */
 #define OCP_SYSFS_ADDTL(type, format, name, field)			\
 static ssize_t								\
-show_##name##_##field(struct device *dev, char *buf)			\
+show_##name##_##field(struct device *dev, struct device_attribute *attr, char *buf)			\
 {									\
 	struct ocp_device *odev = to_ocp_dev(dev);			\
 	type *add = odev->def->additions;				\