nand: Embed mtd_info in struct nand_chip

[pandora-u-boot.git] / drivers / mtd / nand / vf610_nfc.c

diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index 1faec5e..3be8b02 100644 (file)
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -630,7 +630,7 @@ struct vf610_nfc_config {
 
 static int vf610_nfc_nand_init(int devnum, void __iomem *addr)
 {
-       struct mtd_info *mtd = &nand_info[devnum];
+       struct mtd_info *mtd;
        struct nand_chip *chip;
        struct vf610_nfc *nfc;
        int err = 0;
@@ -653,6 +653,7 @@ static int vf610_nfc_nand_init(int devnum, void __iomem *addr)
        chip = &nfc->chip;
        nfc->regs = addr;
 
+       mtd = &chip->mtd;
        mtd->priv = chip;
        chip->priv = nfc;
 
@@ -753,7 +754,7 @@ static int vf610_nfc_nand_init(int devnum, void __iomem *addr)
        if (err)
                return err;
 
-       err = nand_register(devnum);
+       err = nand_register(devnum, mtd);
        if (err)
                return err;