aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-11-14 17:43:10 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-11-14 17:43:10 +0000
commit62a7795afd032c31571efcfefb5b7e4aa4df086c (patch)
treec49a14576a38664825febf086de61f6e2abfe937 /target/linux/ar71xx/files/drivers
parent3b0870f450a152947db9ce71d3a44adceb002675 (diff)
downloadupstream-62a7795afd032c31571efcfefb5b7e4aa4df086c.tar.gz
upstream-62a7795afd032c31571efcfefb5b7e4aa4df086c.tar.bz2
upstream-62a7795afd032c31571efcfefb5b7e4aa4df086c.zip
ar71xx: merge nand scan patch
SVN-Revision: 29122
Diffstat (limited to 'target/linux/ar71xx/files/drivers')
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c2
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
index d6c684309d..664f7dfcc0 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info);
- ret = nand_scan_ident(&info->mtd, 1);
+ ret = nand_scan_ident(&info->mtd, 1, NULL);
if (ret) {
ret = -ENXIO;
goto err_free_info;
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
index 07bf8e1299..831df14ec8 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
@@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info);
- ret = nand_scan_ident(&info->mtd, 1);
+ ret = nand_scan_ident(&info->mtd, 1, NULL);
if (ret) {
ret = -ENXIO;
goto err_free_info;