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 / w83792d.c

diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index f836198b705c231ef9d7eda88b92079365c9bdc8..299629d47ed60a44ec91adfcbaac2ddac2e540d7 100644 (file)
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -46,7 +46,8 @@
 #include <linux/sysfs.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+                                               I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83792d);
@@ -1385,8 +1386,8 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
        if (kind == w83792d) {
                client_name = "w83792d";
        } else {
-               dev_err(dev, "w83792d: Internal error: unknown"
-                                         " kind (%d)?!?", kind);
+               dev_err(dev, "w83792d: Internal error: unknown kind (%d)?!?\n",
+                       kind);
                goto ERROR1;
        }