Merge rsync://oss.sgi.com/git/xfs-2.6

[linux-2.6] / drivers / i2c / chips / w83l785ts.c

diff --git a/drivers/i2c/chips/w83l785ts.c b/drivers/i2c/chips/w83l785ts.c
index 59bbc5881fa6079c07310b7dafc261d75653dbdb..74d4b58e42372dbd438de41bb5a1ab64875e3cca 100644 (file)
--- a/drivers/i2c/chips/w83l785ts.c
+++ b/drivers/i2c/chips/w83l785ts.c
@@ -118,13 +118,13 @@ struct w83l785ts_data {
  * Sysfs stuff
  */
 
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct w83l785ts_data *data = w83l785ts_update_device(dev);
        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct w83l785ts_data *data = w83l785ts_update_device(dev);
        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));