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 | de3ee69258bc2ebd5a9033e6d40e5c16cd763dfc (patch) | |
| tree | 44640e7aca4583a9649917aaa80dabab4908d9d6 /target/linux | |
| parent | 6f8941554b731136ea9ce09ea3be3433e61ecac9 (diff) | |
| download | master-187ad058-de3ee69258bc2ebd5a9033e6d40e5c16cd763dfc.tar.gz master-187ad058-de3ee69258bc2ebd5a9033e6d40e5c16cd763dfc.tar.bz2 master-187ad058-de3ee69258bc2ebd5a9033e6d40e5c16cd763dfc.zip | |
ar71xx: merge nand scan patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29122 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
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 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; |