nand: Embed mtd_info in struct nand_chip

[karo-tx-uboot.git] / drivers / mtd / nand / denali.c

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 5894fcc4a8eedece6232fb3b8562fda9d9d10e77..13d10aeaa83a0e9d0147f4ccc093f8c14bb6edc8 100644 (file)
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1263,7 +1263,7 @@ static int denali_init(struct denali_nand_info *denali)
                goto fail;
        }
 
-       ret = nand_register(0);
+       ret = nand_register(0, denali->mtd);
 
 fail:
        return ret;
@@ -1282,7 +1282,7 @@ static int __board_nand_init(void)
         * for instantiating struct nand_chip, while drivers/mtd/nand/nand.c
         * still provides a "struct mtd_info nand_info" instance.
         */
-       denali->mtd = &nand_info[0];
+       denali->mtd = &denali->nand.mtd;
 
        /*
         * In the future, these base addresses should be taken from