Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index b5db354e2f198952a095d4ccf8e7632f9d591dc6..77f2d482888b1fe3293080be6d83d17a17a4fd08 100644 (file)
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -49,7 +49,7 @@
  * Address is fully defined internally and cannot be changed.
  */
 
-static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
@@ -96,7 +96,6 @@ static struct i2c_driver w83l785ts_driver = {
        .driver = {
                .name   = "w83l785ts",
        },
-       .id             = I2C_DRIVERID_W83L785TS,
        .attach_adapter = w83l785ts_attach_adapter,
        .detach_client  = w83l785ts_detach_client,
 };