ide-tape: merge callbacks

[linux-2.6-omap-h63xx.git] / drivers / hwmon / ds1621.c

diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index b7bd000b130f4a76e2316f3036ec4817fc55437f..5f300ffed6577e8ea95108a60204516c3fb076e6 100644 (file)
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -34,7 +34,7 @@
 #include "lm75.h"
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                        0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
 /* Insmod parameters */
@@ -94,7 +94,6 @@ static struct i2c_driver ds1621_driver = {
        .driver = {
                .name   = "ds1621",
        },
-       .id             = I2C_DRIVERID_DS1621,
        .attach_adapter = ds1621_attach_adapter,
        .detach_client  = ds1621_detach_client,
 };