X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4d70a5a68afb9e1cdde85c965047bcb1cfe972e7..adde7768a2eab2950a7628319ec832c63a00ff03:/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch?ds=sidebyside

diff --git a/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
index 80fb4d40f..bff451200 100644
--- a/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
-===================================================================
---- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0001.c	2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c	2007-09-21 16:23:57.000000000 +0800
-@@ -933,7 +933,7 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -944,7 +944,7 @@
  
  static int __xipram xip_wait_for_operation(
  		struct map_info *map, struct flchip *chip,
@@ -11,7 +9,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  {
  	struct cfi_private *cfi = map->fldrv_priv;
  	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
-@@ -942,7 +942,7 @@
+@@ -953,7 +953,7 @@
  	flstate_t oldstate, newstate;
  
         	start = xip_currtime();
@@ -20,7 +18,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  	if (usec == 0)
  		usec = 500000;
  	done = 0;
-@@ -1052,8 +1052,8 @@
+@@ -1063,8 +1063,8 @@
  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
  	INVALIDATE_CACHED_RANGE(map, from, size)
  
@@ -31,7 +29,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  
  #else
  
-@@ -1065,65 +1065,65 @@
+@@ -1076,65 +1076,65 @@
  static int inval_cache_and_wait_for_operation(
  		struct map_info *map, struct flchip *chip,
  		unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@@ -132,7 +130,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  	/* Done and happy. */
   	chip->state = FL_STATUS;
  	return 0;
-@@ -1132,7 +1132,8 @@
+@@ -1143,7 +1143,8 @@
  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \
@@ -142,7 +140,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  
  
  static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
-@@ -1356,7 +1357,7 @@
+@@ -1374,7 +1375,7 @@
  
  	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
  				   adr, map_bankwidth(map),
@@ -151,7 +149,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  	if (ret) {
  		xip_enable(map, chip, adr);
  		printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
-@@ -1593,7 +1594,7 @@
+@@ -1614,7 +1615,7 @@
  
  	ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
  				   initial_adr, initial_len,
@@ -160,7 +158,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  	if (ret) {
  		map_write(map, CMD(0x70), cmd_adr);
  		chip->state = FL_STATUS;
-@@ -1728,7 +1729,7 @@
+@@ -1749,7 +1750,7 @@
  
  	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
  				   adr, len,