diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 17:19:24 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 17:19:24 +0000 |
| commit | f6d815a2839a1dcecba7132ce8499e41fc878dfc (patch) | |
| tree | 253cbe10bc6569ef56223632eed27a179e447946 /target/linux/generic-2.6/patches-2.6.24/009-revert_intel_flash_breakage.patch | |
| parent | 41ccd65d1af59a115e5e03c995f69966ef19d66c (diff) | |
| download | upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.tar.gz upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.tar.bz2 upstream-f6d815a2839a1dcecba7132ce8499e41fc878dfc.zip | |
refresh generic 2.6.24 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11302 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 | 22 |
1 files changed, 10 insertions, 12 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 63fc8ffad9..bff4512000 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.24.7/drivers/mtd/chips/cfi_cmdset_0001.c -=================================================================== ---- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0001.c -+++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c -@@ -944,7 +944,7 @@ static void __xipram xip_enable(struct m +--- 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.24.7/drivers/mtd/chips/cfi_cmdset_0001.c { struct cfi_private *cfi = map->fldrv_priv; struct cfi_pri_intelext *cfip = cfi->cmdset_priv; -@@ -953,7 +953,7 @@ static int __xipram xip_wait_for_operati +@@ -953,7 +953,7 @@ flstate_t oldstate, newstate; start = xip_currtime(); @@ -20,7 +18,7 @@ Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0001.c if (usec == 0) usec = 500000; done = 0; -@@ -1063,8 +1063,8 @@ static int __xipram xip_wait_for_operati +@@ -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.24.7/drivers/mtd/chips/cfi_cmdset_0001.c #else -@@ -1076,65 +1076,65 @@ static int __xipram xip_wait_for_operati +@@ -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.24.7/drivers/mtd/chips/cfi_cmdset_0001.c /* Done and happy. */ chip->state = FL_STATUS; return 0; -@@ -1143,7 +1143,8 @@ static int inval_cache_and_wait_for_oper +@@ -1143,7 +1143,8 @@ #endif #define WAIT_TIMEOUT(map, chip, adr, udelay) \ @@ -142,7 +140,7 @@ Index: linux-2.6.24.7/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) -@@ -1374,7 +1375,7 @@ static int __xipram do_write_oneword(str +@@ -1374,7 +1375,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, map_bankwidth(map), @@ -151,7 +149,7 @@ Index: linux-2.6.24.7/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); -@@ -1614,7 +1615,7 @@ static int __xipram do_write_buffer(stru +@@ -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.24.7/drivers/mtd/chips/cfi_cmdset_0001.c if (ret) { map_write(map, CMD(0x70), cmd_adr); chip->state = FL_STATUS; -@@ -1749,7 +1750,7 @@ static int __xipram do_erase_oneblock(st +@@ -1749,7 +1750,7 @@ ret = INVAL_CACHE_AND_WAIT(map, chip, adr, adr, len, |