Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[mv-sheeva.git] / drivers / hwmon / lm85.c

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 095e58ac2cebbce83f86b999c0c5ecc07186b3e5..342e9663119d45ef9d7c14a9ab240110ca554523 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -374,8 +374,8 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
                        int kind);
 static int lm85_detach_client(struct i2c_client *client);
 
-static int lm85_read_value(struct i2c_client *client, u8 register);
-static int lm85_write_value(struct i2c_client *client, u8 register, int value);
+static int lm85_read_value(struct i2c_client *client, u8 reg);
+static int lm85_write_value(struct i2c_client *client, u8 reg, int value);
 static struct lm85_data *lm85_update_device(struct device *dev);
 static void lm85_init_client(struct i2c_client *client);