Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c
index 0e86cc893981..5be164ed278e 100644
--- a/drivers/i2c/chips/lm75.c
+++ b/drivers/i2c/chips/lm75.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -75,7 +74,7 @@ static struct i2c_driver lm75_driver = {
 };
 
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct lm75_data *data = lm75_update_device(dev);               \
         return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value));   \
@@ -85,7 +84,7 @@ show(temp_hyst);
 show(temp_input);
 
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                               \
         struct i2c_client *client = to_i2c_client(dev);         \
         struct lm75_data *data = i2c_get_clientdata(client);    \