diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:24:51 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:24:51 +0000 |
commit | 37044cf01e5764164d34a4bfe14f9f00f7a2f6ea (patch) | |
tree | db857f99d1b528f6f722bda21b589e60a7461598 /target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch | |
parent | 7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe (diff) | |
download | upstream-37044cf01e5764164d34a4bfe14f9f00f7a2f6ea.tar.gz upstream-37044cf01e5764164d34a4bfe14f9f00f7a2f6ea.tar.bz2 upstream-37044cf01e5764164d34a4bfe14f9f00f7a2f6ea.zip |
refresh generic 2.6.23 patches
SVN-Revision: 11187
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch index 9e945257b5..5e701987ad 100644 --- a/target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch +++ b/target/linux/generic-2.6/patches-2.6.23/009-revert_intel_flash_breakage.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c +Index: linux-2.6.23.17/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 @@ +--- linux-2.6.23.17.orig/drivers/mtd/chips/cfi_cmdset_0001.c ++++ linux-2.6.23.17/drivers/mtd/chips/cfi_cmdset_0001.c +@@ -933,7 +933,7 @@ static void __xipram xip_enable(struct m static int __xipram xip_wait_for_operation( struct map_info *map, struct flchip *chip, @@ -11,7 +11,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 @@ +@@ -942,7 +942,7 @@ static int __xipram xip_wait_for_operati flstate_t oldstate, newstate; start = xip_currtime(); @@ -20,7 +20,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 @@ +@@ -1052,8 +1052,8 @@ static int __xipram xip_wait_for_operati #define XIP_INVAL_CACHED_RANGE(map, from, size) \ INVALIDATE_CACHED_RANGE(map, from, size) @@ -31,7 +31,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c #else -@@ -1065,65 +1065,65 @@ +@@ -1065,65 +1065,65 @@ static int __xipram xip_wait_for_operati 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 +132,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 @@ +@@ -1132,7 +1132,8 @@ static int inval_cache_and_wait_for_oper #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -142,7 +142,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 @@ +@@ -1356,7 +1357,7 @@ static int __xipram do_write_oneword(str ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -151,7 +151,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 @@ +@@ -1593,7 +1594,7 @@ static int __xipram do_write_buffer(stru ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, adr, len, @@ -160,7 +160,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 @@ +@@ -1728,7 +1729,7 @@ static int __xipram do_erase_oneblock(st ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, |