diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-11-14 17:43:10 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-11-14 17:43:10 +0000 |
| commit | 62a7795afd032c31571efcfefb5b7e4aa4df086c (patch) | |
| tree | c49a14576a38664825febf086de61f6e2abfe937 /target | |
| parent | 3b0870f450a152947db9ce71d3a44adceb002675 (diff) | |
| download | mtk-20170518-62a7795afd032c31571efcfefb5b7e4aa4df086c.zip mtk-20170518-62a7795afd032c31571efcfefb5b7e4aa4df086c.tar.gz mtk-20170518-62a7795afd032c31571efcfefb5b7e4aa4df086c.tar.bz2 | |
ar71xx: merge nand scan patch
SVN-Revision: 29122
Diffstat (limited to 'target')
3 files changed, 2 insertions, 24 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 d6c6843..664f7df 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 07bf8e1..831df14 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 0b36217..0000000 --- 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; |