diff --git a/[refs] b/[refs]
index fdc064f8bb2a..45f18b9bc22c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c3a50b7d7ec45da34e73cac66cde12dd6092dd8
+refs/heads/master: 4b1cf1facca31b7db2a61d8aa2ba40d5a93a0957
diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c
index 19011c20390b..92efa87258b9 100644
--- a/trunk/drivers/dma/fsldma.c
+++ b/trunk/drivers/dma/fsldma.c
@@ -1398,7 +1398,7 @@ static int fsldma_of_remove(struct of_device *op)
 	return 0;
 }
 
-static struct of_device_id fsldma_of_ids[] = {
+static const struct of_device_id fsldma_of_ids[] = {
 	{ .compatible = "fsl,eloplus-dma", },
 	{ .compatible = "fsl,elo-dma", },
 	{}
diff --git a/trunk/drivers/dma/ppc4xx/adma.c b/trunk/drivers/dma/ppc4xx/adma.c
index 0a3478e910f0..e69d87f24a25 100644
--- a/trunk/drivers/dma/ppc4xx/adma.c
+++ b/trunk/drivers/dma/ppc4xx/adma.c
@@ -4940,7 +4940,7 @@ static int ppc440spe_configure_raid_devices(void)
 	return ret;
 }
 
-static struct of_device_id __devinitdata ppc440spe_adma_of_match[] = {
+static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {
 	{ .compatible	= "ibm,dma-440spe", },
 	{ .compatible	= "amcc,xor-accelerator", },
 	{},