diff --git a/[refs] b/[refs]
index 74e994f3d4dc..ff2a93d39b24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cccdceb938b37a415c42a0635b8a19893a3a19bb
+refs/heads/master: d4e948636bd1d9bdf07d38d63d324812725f9d88
diff --git a/trunk/drivers/mfd/aat2870-core.c b/trunk/drivers/mfd/aat2870-core.c
index 762061712db6..e6da563178df 100644
--- a/trunk/drivers/mfd/aat2870-core.c
+++ b/trunk/drivers/mfd/aat2870-core.c
@@ -500,7 +500,7 @@ static int aat2870_i2c_resume(struct i2c_client *client)
 #define aat2870_i2c_resume	NULL
 #endif /* CONFIG_PM */
 
-static struct i2c_device_id aat2870_i2c_id_table[] = {
+static const struct i2c_device_id aat2870_i2c_id_table[] = {
 	{ "aat2870", 0 },
 	{ }
 };