diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-05-26 19:41:42 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-05-26 19:41:42 +0000 |
commit | 94c0d84182f1ca41f280b43d4f52fe6346153c48 (patch) | |
tree | 324b8afd607b0c63c5746d58b66ce75647153e8d /target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch | |
parent | d4cce8a452b1f1457b19b356245d1b91eb3357e8 (diff) | |
download | master-31e0f0ae-94c0d84182f1ca41f280b43d4f52fe6346153c48.tar.gz master-31e0f0ae-94c0d84182f1ca41f280b43d4f52fe6346153c48.tar.bz2 master-31e0f0ae-94c0d84182f1ca41f280b43d4f52fe6346153c48.zip |
refresh kernel patches so that they apply cleanly
SVN-Revision: 7347
Diffstat (limited to 'target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch')
-rw-r--r-- | target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch index ea06360c48..d75607392d 100644 --- a/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch +++ b/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch @@ -1,6 +1,7 @@ ---- linux.old/drivers/mtd/chips/cfi_cmdset_0001.c 2007-02-13 02:41:50.816650352 +0100 -+++ linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c 2007-02-13 02:42:13.782159064 +0100 -@@ -908,7 +908,7 @@ +diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c +--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0001.c 2007-04-27 23:49:26.000000000 +0200 ++++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0001.c 2007-05-26 19:40:46.809023552 +0200 +@@ -919,7 +919,7 @@ static int __xipram xip_wait_for_operation( struct map_info *map, struct flchip *chip, @@ -9,7 +10,7 @@ { struct cfi_private *cfi = map->fldrv_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv; -@@ -917,7 +917,7 @@ +@@ -928,7 +928,7 @@ flstate_t oldstate, newstate; start = xip_currtime(); @@ -18,7 +19,7 @@ if (usec == 0) usec = 500000; done = 0; -@@ -1027,8 +1027,8 @@ +@@ -1038,8 +1038,8 @@ #define XIP_INVAL_CACHED_RANGE(map, from, size) \ INVALIDATE_CACHED_RANGE(map, from, size) @@ -29,7 +30,7 @@ #else -@@ -1040,65 +1040,65 @@ +@@ -1051,65 +1051,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, @@ -130,7 +131,7 @@ /* Done and happy. */ chip->state = FL_STATUS; return 0; -@@ -1107,7 +1107,8 @@ +@@ -1118,7 +1118,8 @@ #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -140,7 +141,7 @@ static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len) -@@ -1331,7 +1332,7 @@ +@@ -1342,7 +1343,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -149,7 +150,7 @@ if (ret) { xip_enable(map, chip, adr); printk(KERN_ERR "%s: word write error (status timeout)\n", map->name); -@@ -1568,7 +1569,7 @@ +@@ -1579,7 +1580,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, adr, len, @@ -158,7 +159,7 @@ if (ret) { map_write(map, CMD(0x70), cmd_adr); chip->state = FL_STATUS; -@@ -1703,7 +1704,7 @@ +@@ -1714,7 +1715,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, |