diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/include/asm-ppc/ocp.h linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/include/asm-ppc/ocp.h
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/include/asm-ppc/ocp.h	2005-05-16 20:36:26.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/include/asm-ppc/ocp.h	2005-05-16 23:45:53.000000000 -0400
@@ -189,7 +189,7 @@ extern void ocp_for_each_device(void(*ca
 /* 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;				\