Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / hwmon / tmp421.c

diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 6b4165c12092b388c365824c49c8c7d6a65c9a8c..0517a8f09d35ab6730e81cdac921fe5da2e5ca54 100644 (file)
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -36,8 +36,8 @@
 #include <linux/sysfs.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2a, 0x4c, 0x4d, 0x4e, 0x4f,
-                                      I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2a, 0x4c, 0x4d, 0x4e, 0x4f,
+                                            I2C_CLIENT_END };
 
 enum chips { tmp421, tmp422, tmp423 };