aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-12-27 21:28:02 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-12-27 21:28:02 +0000
commit2434746dd4bc0c8c00d5a94e44f05604e2dca304 (patch)
tree180b2c74131eb4d4bd7c855e1de0ca28bda8127c /target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch
parent4060780e57e972944be3a83db84bc37948949698 (diff)
downloadupstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.tar.gz
upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.tar.bz2
upstream-2434746dd4bc0c8c00d5a94e44f05604e2dca304.zip
switch ixp4xx and ubicom32 to 2.6.30, get rid of 2.6.28 files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 9e4a3c56f0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.28/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -579,6 +579,7 @@ struct platform_nand_chip {
- int chip_delay;
- unsigned int options;
- const char **part_probe_types;
-+ int (*chip_fixup)(struct mtd_info *mtd);
- void *priv;
- };
-
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -71,7 +71,18 @@ static int __init plat_nand_probe(struct
- platform_set_drvdata(pdev, data);
-
- /* Scan to find existance of the device */
-- if (nand_scan(&data->mtd, 1)) {
-+ if (nand_scan_ident(&data->mtd, 1)) {
-+ res = -ENXIO;
-+ goto out;
-+ }
-+
-+ if (pdata->chip.chip_fixup) {
-+ res = pdata->chip.chip_fixup(&data->mtd);
-+ if (res)
-+ goto out;
-+ }
-+
-+ if (nand_scan_tail(&data->mtd)) {
- res = -ENXIO;
- goto out;
- }