mtd: Blackfin NFC: fix build error after nand_scan_ident() change

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Mon Sep 13 04:59:02 EDT 2010


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=eac15a429a27cb74115daaf4c1127c5e854d50e4
Commit:     eac15a429a27cb74115daaf4c1127c5e854d50e4
Parent:     f7b66e5e51d31c45c6039db9a6da7863fb75be1e
Author:     Mike Frysinger <vapier at gentoo.org>
AuthorDate: Sat Aug 28 01:45:00 2010 -0400
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Sep 13 08:48:50 2010 +0100

    mtd: Blackfin NFC: fix build error after nand_scan_ident() change
    
    Seems some patches got out sync when being merged.  The Blackfin NFC
    driver was updated to use nand_scan_ident(), but it missed the change
    where nand_scan_ident() now takes 3 arguments.  So update this driver
    to fix build failures.
    
    Signed-off-by: Mike Frysinger <vapier at gentoo.org>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/bf5xx_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index a382e3d..162c5ea 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -710,7 +710,7 @@ static int bf5xx_nand_scan(struct mtd_info *mtd)
 	struct nand_chip *chip = mtd->priv;
 	int ret;
 
-	ret = nand_scan_ident(mtd, 1);
+	ret = nand_scan_ident(mtd, 1, NULL);
 	if (ret)
 		return ret;
 



More information about the linux-mtd-cvs mailing list