aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-08 12:10:18 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-08 12:10:18 +0000
commitff0ca066b820c970c900187d960f89c0506ea9d5 (patch)
tree059ad1fcf4d3fb24797ef02b4f4d92d5f74817a1 /target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch
parent03965bd6f312c14c35512aae8c0c1393ca662dbe (diff)
downloadupstream-ff0ca066b820c970c900187d960f89c0506ea9d5.tar.gz
upstream-ff0ca066b820c970c900187d960f89c0506ea9d5.tar.bz2
upstream-ff0ca066b820c970c900187d960f89c0506ea9d5.zip
linux/ar71xx: add preliminary 2.6.36 kernel support (refresh patches)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23317 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch b/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch
new file mode 100644
index 0000000000..dfaad1e0e7
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.36/400-2.6.35-fix-nand_scan_ident-options.patch
@@ -0,0 +1,22 @@
+--- a/drivers/mtd/nand/rb4xx_nand.c
++++ b/drivers/mtd/nand/rb4xx_nand.c
+@@ -218,7 +218,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;