X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fpatches-2.6.26%2F080-mtd_plat_nand_chip_fixup.patch;fp=target%2Flinux%2Fgeneric-2.6%2Fpatches-2.6.26%2F080-mtd_plat_nand_chip_fixup.patch;h=0000000000000000000000000000000000000000;hb=fc6101659304951806a7da110f9666102c485bf6;hp=3440004e41553ba620580eecd44c4d2806b193b6;hpb=e1189d60a42cb880f8054b5c2707ea98626a15fb;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 3440004e41..0000000000
--- a/target/linux/generic-2.6/patches-2.6.26/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
-@@ -573,6 +573,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;
- 	}