diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-14 17:43:10 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-14 17:43:10 +0000 |
commit | d9b73ec6744d03a52142bc36837750e8bb33b744 (patch) | |
tree | 44640e7aca4583a9649917aaa80dabab4908d9d6 /target/linux/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch | |
parent | 4686f1d0fc602138ad2002a7ea486c0bfdcb2ea3 (diff) |
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/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch')
-rw-r--r-- | target/linux/ar71xx/patches-2.6.39/400-2.6.35-fix-nand_scan_ident-options.patch | 22 |
1 files changed, 0 insertions, 22 deletions
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 0b36217b6..000000000 --- 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; |