git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
atmel_nand.c
diff --git
a/drivers/mtd/nand/atmel_nand.c
b/drivers/mtd/nand/atmel_nand.c
index
524e6c9
..
04d3088
100644
(file)
--- a/
drivers/mtd/nand/atmel_nand.c
+++ b/
drivers/mtd/nand/atmel_nand.c
@@
-474,7
+474,7
@@
static int __init atmel_nand_probe(struct platform_device *pdev)
}
/* first scan to find the device and get the page size */
- if (nand_scan_ident(mtd, 1)) {
+ if (nand_scan_ident(mtd, 1
, NULL
)) {
res = -ENXIO;
goto err_scan_ident;
}