From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 14 Nov 2011 17:43:10 +0000 (+0000)
Subject: ar71xx: merge nand scan patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=62a7795afd032c31571efcfefb5b7e4aa4df086c;p=openwrt%2Fstaging%2Fblocktrron.git

ar71xx: merge nand scan patch

SVN-Revision: 29122
---

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;
diff --git a/target/linux/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch b/target/linux/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch
deleted file mode 100644
index 0b36217b6e..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/mtd/nand/rb4xx_nand.c
-+++ b/drivers/mtd/nand/rb4xx_nand.c
-@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
- 
- 	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;
---- a/drivers/mtd/nand/rb750_nand.c
-+++ b/drivers/mtd/nand/rb750_nand.c
-@@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struc
- 
- 	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;