From 48983d35d70395a391026c8f8bb1f44165ce058e Mon Sep 17 00:00:00 2001 From: kaloz Date: Fri, 30 May 2008 16:30:51 +0000 Subject: refresh generic 2.6.25 patches to match upstream style git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../009-revert_intel_flash_breakage.patch | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch') diff --git a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch index d38cba283..d2c1dc5d4 100644 --- a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch +++ b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c -+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c -@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m +--- a/drivers/mtd/chips/cfi_cmdset_0001.c ++++ b/drivers/mtd/chips/cfi_cmdset_0001.c +@@ -1008,7 +1008,7 @@ static int __xipram xip_wait_for_operation( struct map_info *map, struct flchip *chip, @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c { struct cfi_private *cfi = map->fldrv_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv; -@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati +@@ -1017,7 +1017,7 @@ flstate_t oldstate, newstate; start = xip_currtime(); @@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c if (usec == 0) usec = 500000; done = 0; -@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati +@@ -1127,8 +1127,8 @@ #define XIP_INVAL_CACHED_RANGE(map, from, size) \ INVALIDATE_CACHED_RANGE(map, from, size) @@ -31,7 +29,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c #else -@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati +@@ -1140,65 +1140,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.25.4/drivers/mtd/chips/cfi_cmdset_0001.c /* Done and happy. */ chip->state = FL_STATUS; return 0; -@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper +@@ -1207,7 +1207,8 @@ #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -142,7 +140,7 @@ Index: linux-2.6.25.4/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) -@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str +@@ -1438,7 +1439,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -151,7 +149,7 @@ Index: linux-2.6.25.4/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); -@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru +@@ -1678,7 +1679,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, initial_adr, initial_len, @@ -160,7 +158,7 @@ Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0001.c if (ret) { map_write(map, CMD(0x70), cmd_adr); chip->state = FL_STATUS; -@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st +@@ -1813,7 +1814,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, -- cgit v1.2.3