diff -u -p a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
--- a/drivers/mtd/nand/pasemi_nand.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/mtd/nand/pasemi_nand.c 2010-01-08 04:26:40.000000000 +0100
@@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove(
 	return 0;
 }

-static struct of_device_id pasemi_nand_match[] =
+static const struct of_device_id pasemi_nand_match[] =
 {
 	{
 		.compatible   = "pasemi,localbus-nand",
diff -u -p a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
--- a/drivers/mtd/nand/fsl_upm.c 2010-01-07 19:08:42.000000000 +0100
+++ b/drivers/mtd/nand/fsl_upm.c 2010-01-08 04:28:52.000000000 +0100
@@ -349,7 +349,7 @@ static int __devexit fun_remove(struct o
 	return 0;
 }

-static struct of_device_id of_fun_match[] = {
+static const struct of_device_id of_fun_match[] = {
 	{ .compatible = "fsl,upm-nand" },
 	{},
 };
diff -u -p a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
--- a/drivers/mtd/nand/socrates_nand.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/mtd/nand/socrates_nand.c 2010-01-08 04:29:01.000000000 +0100
@@ -290,7 +290,7 @@ static int __devexit socrates_nand_remov
 	return 0;
 }

-static struct of_device_id socrates_nand_match[] =
+static const struct of_device_id socrates_nand_match[] =
 {
 	{
 		.compatible   = "abb,socrates-nand",