Merge remote branch 'origin' into secretlab/next-devicetree

[sfrench/cifs-2.6.git] / drivers / mtd / nand / pasemi_nand.c

diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index a97e9c95ab6a94427ee6d55cf03204ede1dd7a70..f02af24d033a73341b7490acec7f2255e8ed67c9 100644 (file)
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove(struct of_device *ofdev)
        return 0;
 }
 
-static struct of_device_id pasemi_nand_match[] =
+static const struct of_device_id pasemi_nand_match[] =
 {
        {
                .compatible   = "pasemi,localbus-nand",