del a 33 patch

2 files changed, 0 insertions, 63 deletions

diff --git a/queue-2.6.33/mtd-jedec_probe-initialise-make-sector-erase-command-variable.patch b/queue-2.6.33/mtd-jedec_probe-initialise-make-sector-erase-command-variable.patch
deleted file mode 100644
index 2021343..0000000
--- a/queue-2.6.33/mtd-jedec_probe-initialise-make-sector-erase-command-variable.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ceabebb2bd2672f709e4454e16bc6042732e2dfe Mon Sep 17 00:00:00 2001
-From: Antony Pavlov <antony@niisi.msk.ru>
-Date: Fri, 11 Feb 2011 13:00:37 +0300
-Subject: mtd: jedec_probe: initialise make sector erase command variable
-
-From: Antony Pavlov <antony@niisi.msk.ru>
-
-commit ceabebb2bd2672f709e4454e16bc6042732e2dfe upstream.
-
-In the commit 08968041bef437ec363623cd3218c2b083537ada
- (mtd: cfi_cmdset_0002: make sector erase command variable)
-introdused a field sector_erase_cmd. In the same commit initialisation
-of cfi->sector_erase_cmd made in cfi_chip_setup()
-(file drivers/mtd/chips/cfi_probe.c), so the CFI chip has no problem:
-
-...
-        cfi->cfi_mode = CFI_MODE_CFI;
-        cfi->sector_erase_cmd = CMD(0x30);
-...
-
-But for the JEDEC chips this initialisation is not carried out,
-so the JEDEC chips have sector_erase_cmd == 0.
-
-This patch adds the missing initialisation.
-
-Signed-off-by: Antony Pavlov <antony@niisi.msk.ru>
-Acked-by: Guillaume LECERF <glecerf@gmail.com>
-Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/mtd/chips/jedec_probe.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/chips/jedec_probe.c
-+++ b/drivers/mtd/chips/jedec_probe.c
-@@ -1923,7 +1923,7 @@ static void jedec_reset(u32 base, struct
- }
- 
- 
--static int cfi_jedec_setup(struct cfi_private *cfi, int index)
-+static int cfi_jedec_setup(struct map_info *map, struct cfi_private *cfi, int index)
- {
- 	int i,num_erase_regions;
- 	uint8_t uaddr;
-@@ -1950,6 +1950,7 @@ static int cfi_jedec_setup(struct cfi_pr
- 	cfi->cfiq->NumEraseRegions = jedec_table[index].nr_regions;
- 	cfi->cfiq->DevSize = jedec_table[index].dev_size;
- 	cfi->cfi_mode = CFI_MODE_JEDEC;
-+	cfi->sector_erase_cmd = CMD(0x30);
- 
- 	for (i=0; i<num_erase_regions; i++){
- 		cfi->cfiq->EraseRegionInfo[i] = jedec_table[index].regions[i];
-@@ -2163,7 +2164,7 @@ static int jedec_probe_chip(struct map_i
- 				       "MTD %s(): matched device 0x%x,0x%x unlock_addrs: 0x%.4x 0x%.4x\n",
- 				       __func__, cfi->mfr, cfi->id,
- 				       cfi->addr_unlock1, cfi->addr_unlock2 );
--				if (!cfi_jedec_setup(cfi, i))
-+				if (!cfi_jedec_setup(map, cfi, i))
- 					return 0;
- 				goto ok_out;
- 			}
diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index 74973cc..0e365c5 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -427,7 +427,6 @@ dib7000m-add-pid-filtering.patch
 net-don-t-allow-cap_net_admin-to-load-non-netdev-kernel-modules.patch
 hwmon-f71882fg-set-platform-drvdata-to-null-later.patch
 mtd-jedec_probe-change-variable-name-from-cfi_p-to-cfi.patch
-mtd-jedec_probe-initialise-make-sector-erase-command-variable.patch
 mtd-add-platform-prefix-for-platform-modalias.patch
 libata-no-special-completion-processing-for-eh-commands.patch
 mips-mtx-1-make-au1000_eth-probe-all-phy-addresses.patch