diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-08 19:16:45 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-08 19:16:45 +0000 |
| commit | 95316451cb8a4d8c63fb5cc7074912f497815f12 (patch) | |
| tree | 4cb2f87be022976e427d16f1411dc66c06fd5a51 /target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch | |
| parent | 32e68db8d07820e1494fd6cd1db8e0a040e88bf1 (diff) | |
[kernel] generic-2.6/2.6.24: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14450 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch | 16 |
1 files changed, 8 insertions, 8 deletions
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 bff451200..0237dca55 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,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c -@@ -944,7 +944,7 @@ +@@ -944,7 +944,7 @@ static void __xipram xip_enable(struct m static int __xipram xip_wait_for_operation( struct map_info *map, struct flchip *chip, @@ -9,7 +9,7 @@ { struct cfi_private *cfi = map->fldrv_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv; -@@ -953,7 +953,7 @@ +@@ -953,7 +953,7 @@ static int __xipram xip_wait_for_operati flstate_t oldstate, newstate; start = xip_currtime(); @@ -18,7 +18,7 @@ if (usec == 0) usec = 500000; done = 0; -@@ -1063,8 +1063,8 @@ +@@ -1063,8 +1063,8 @@ static int __xipram xip_wait_for_operati #define XIP_INVAL_CACHED_RANGE(map, from, size) \ INVALIDATE_CACHED_RANGE(map, from, size) @@ -29,7 +29,7 @@ #else -@@ -1076,65 +1076,65 @@ +@@ -1076,65 +1076,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, @@ -130,7 +130,7 @@ /* Done and happy. */ chip->state = FL_STATUS; return 0; -@@ -1143,7 +1143,8 @@ +@@ -1143,7 +1143,8 @@ static int inval_cache_and_wait_for_oper #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -140,7 +140,7 @@ static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len) -@@ -1374,7 +1375,7 @@ +@@ -1374,7 +1375,7 @@ static int __xipram do_write_oneword(str ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -149,7 +149,7 @@ if (ret) { xip_enable(map, chip, adr); printk(KERN_ERR "%s: word write error (status timeout)\n", map->name); -@@ -1614,7 +1615,7 @@ +@@ -1614,7 +1615,7 @@ static int __xipram do_write_buffer(stru ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, initial_adr, initial_len, @@ -158,7 +158,7 @@ if (ret) { map_write(map, CMD(0x70), cmd_adr); chip->state = FL_STATUS; -@@ -1749,7 +1750,7 @@ +@@ -1749,7 +1750,7 @@ static int __xipram do_erase_oneblock(st ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, |