Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / mtd / nand / sh_flctl.c

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 34752fc..81bbb5e 100644 (file)
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -78,7 +78,7 @@ static void start_translation(struct sh_flctl *flctl)
 
 static void timeout_error(struct sh_flctl *flctl, const char *str)
 {
-       dev_err(&flctl->pdev->dev, "Timeout occured in %s\n", str);
+       dev_err(&flctl->pdev->dev, "Timeout occurred in %s\n", str);
 }
 
 static void wait_completion(struct sh_flctl *flctl)
@@ -855,7 +855,7 @@ static int __devinit flctl_probe(struct platform_device *pdev)
                nand->read_word = flctl_read_word;
        }
 
-       ret = nand_scan_ident(flctl_mtd, 1);
+       ret = nand_scan_ident(flctl_mtd, 1, NULL);
        if (ret)
                goto err;