diff --git a/[refs] b/[refs]
index ffeaa18f2f6b..ff928fefb235 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5
+refs/heads/master: 1849f23d6ff57cf9d57741488adb14e0d7942406
diff --git a/trunk/drivers/char/mbcs.c b/trunk/drivers/char/mbcs.c
index 47ff7e470d87..0c7d340b9ab9 100644
--- a/trunk/drivers/char/mbcs.c
+++ b/trunk/drivers/char/mbcs.c
@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
 	return 0;
 }
 
-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
 	{
 	 .part_num = MBCS_PART_NUM,
 	 .mfg_num = MBCS_MFG_NUM,