projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
mtd
/
nand
/
bcm_umi_nand.c
diff --git
a/drivers/mtd/nand/bcm_umi_nand.c
b/drivers/mtd/nand/bcm_umi_nand.c
index
7d1cca7
..
7eb8674
100644
(file)
--- a/
drivers/mtd/nand/bcm_umi_nand.c
+++ b/
drivers/mtd/nand/bcm_umi_nand.c
@@
-446,7
+446,7
@@
static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
* layout we'll be using.
*/
- err = nand_scan_ident(board_mtd, 1);
+ err = nand_scan_ident(board_mtd, 1
, NULL
);
if (err) {
printk(KERN_ERR "nand_scan failed: %d\n", err);
iounmap(bcm_umi_io_base);