diff --git a/[refs] b/[refs]
index a934773a0251..aff78b3c73f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 577cdf0cf5afa5f350fbaddf77bbacdb9f76d2f8
+refs/heads/master: 5cccfd9b3a9ca06b6245ea2c4af052b7db0105a3
diff --git a/trunk/drivers/block/xsysace.c b/trunk/drivers/block/xsysace.c
index e5c5415eb45e..e1c95e208a66 100644
--- a/trunk/drivers/block/xsysace.c
+++ b/trunk/drivers/block/xsysace.c
@@ -1227,7 +1227,7 @@ static int __devexit ace_of_remove(struct of_device *op)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id ace_of_match[] __devinitdata = {
+static const struct of_device_id ace_of_match[] __devinitconst = {
 	{ .compatible = "xlnx,opb-sysace-1.00.b", },
 	{ .compatible = "xlnx,opb-sysace-1.00.c", },
 	{ .compatible = "xlnx,xps-sysace-1.00.a", },