diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 07:06:35 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 07:06:35 +0000 |
commit | b0b3bc5f009249df74c13ec0dc6087cf1943b318 (patch) | |
tree | 04584132f5c79a71a972bf9597a9c1d3085f9bbb /target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch | |
parent | d132c5f42c208e4ab1bb3be0a7503262ee7e4059 (diff) | |
download | master-31e0f0ae-b0b3bc5f009249df74c13ec0dc6087cf1943b318.tar.gz master-31e0f0ae-b0b3bc5f009249df74c13ec0dc6087cf1943b318.tar.bz2 master-31e0f0ae-b0b3bc5f009249df74c13ec0dc6087cf1943b318.zip |
refresh kernel patches
SVN-Revision: 11196
Diffstat (limited to 'target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch')
-rw-r--r-- | target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch b/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch index a481a14f86..89446161a3 100644 --- a/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch +++ b/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch @@ -1,5 +1,7 @@ ---- linux/drivers/mtd/ar7part.c 2007-09-20 21:47:22.000000000 +0200 -+++ linux-mips/drivers/mtd/ar7part.c 2008-05-04 18:49:04.000000000 +0200 +Index: linux-2.6.25.4/drivers/mtd/ar7part.c +=================================================================== +--- linux-2.6.25.4.orig/drivers/mtd/ar7part.c ++++ linux-2.6.25.4/drivers/mtd/ar7part.c @@ -34,6 +34,10 @@ #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281) @@ -11,7 +13,7 @@ struct ar7_bin_rec { unsigned int checksum; unsigned int length; -@@ -47,7 +51,8 @@ +@@ -47,7 +51,8 @@ static int create_mtd_partitions(struct unsigned long origin) { struct ar7_bin_rec header; @@ -21,7 +23,7 @@ unsigned int pre_size = master->erasesize, post_size = 0; unsigned int root_offset = ROOT_OFFSET; -@@ -66,7 +71,7 @@ +@@ -66,7 +71,7 @@ static int create_mtd_partitions(struct do { /* Try 10 blocks starting from master->erasesize */ offset = pre_size; master->read(master, offset, @@ -30,7 +32,7 @@ if (!strncmp((char *)&header, "TIENV0.8", 8)) ar7_parts[1].offset = pre_size; if (header.checksum == LOADER_MAGIC1) -@@ -88,7 +93,7 @@ +@@ -88,7 +93,7 @@ static int create_mtd_partitions(struct while (header.length) { offset += sizeof(header) + header.length; master->read(master, offset, sizeof(header), @@ -39,7 +41,7 @@ } root_offset = offset + sizeof(header) + 4; break; -@@ -96,10 +101,10 @@ +@@ -96,10 +101,10 @@ static int create_mtd_partitions(struct while (header.length) { offset += sizeof(header) + header.length; master->read(master, offset, sizeof(header), |