[S390] vmlogrdr: module initialization function should return negative errors

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

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 116093d0eb3ea2834b8b48bdae704acadfadc9db..d1a3da3dd8e0e84d76fe9dbe569fd5b121a4acde 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -101,10 +101,8 @@
  * 0x4c, 0x4d or 0x4e.
  */
 
-static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
-                                      0x29, 0x2a, 0x2b,
-                                      0x4c, 0x4d, 0x4e,
-                                      I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+       0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
@@ -204,7 +202,6 @@ static struct i2c_driver lm90_driver = {
        .driver = {
                .name   = "lm90",
        },
-       .id             = I2C_DRIVERID_LM90,
        .attach_adapter = lm90_attach_adapter,
        .detach_client  = lm90_detach_client,
 };