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

[linux-2.6] / drivers / hwmon / ds1621.c

diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index c5afa00583089a1aaf3f9d7f4a6db60f6be2524c..203f9c7abb20a78825de40e7d502d1c5a05d133a 100644 (file)
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -89,10 +89,10 @@ static struct ds1621_data *ds1621_update_client(struct device *dev);
 
 /* This is the driver that will be inserted */
 static struct i2c_driver ds1621_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "ds1621",
+       .driver = {
+               .name   = "ds1621",
+       },
        .id             = I2C_DRIVERID_DS1621,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = ds1621_attach_adapter,
        .detach_client  = ds1621_detach_client,
 };
@@ -186,8 +186,8 @@ static int ds1621_attach_adapter(struct i2c_adapter *adapter)
 }
 
 /* This function is called by i2c_probe */
-int ds1621_detect(struct i2c_adapter *adapter, int address,
-                  int kind)
+static int ds1621_detect(struct i2c_adapter *adapter, int address,
+                        int kind)
 {
        int conf, temp;
        struct i2c_client *new_client;