diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/Documentation/filesystems/sysfs.txt linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/Documentation/filesystems/sysfs.txt --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/Documentation/filesystems/sysfs.txt 2005-05-16 20:36:09.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/Documentation/filesystems/sysfs.txt 2005-05-16 23:45:52.000000000 -0400 @@ -214,7 +214,7 @@ Other notes: A very simple (and naive) implementation of a device attribute is: -static ssize_t show_name(struct device * dev, char * buf) +static ssize_t show_name(struct device * dev, struct device_attribute *attr, char * buf) { return sprintf(buf,"%s\n",dev->name); }