[kernel] generic/2.6.28: fix yaffs cvs patch

[openwrt.git] / target / linux / ar7 / patches-2.6.25 / 200-mtd_fixes.patch

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 8944616..850a643 100644 (file)
--- 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,7 +1,5 @@
-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
+--- a/drivers/mtd/ar7part.c
++++ b/drivers/mtd/ar7part.c

 @@ -34,6 +34,10 @@
  #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42)
  #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281)
 @@ -34,6 +34,10 @@
  #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42)
  #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281)


@@ -13,7 +11,7 @@ Index: linux-2.6.25.4/drivers/mtd/ar7part.c
  struct ar7_bin_rec {
        unsigned int checksum;
        unsigned int length;
  struct ar7_bin_rec {
        unsigned int checksum;
        unsigned int length;

-@@ -47,7 +51,8 @@ static int create_mtd_partitions(struct 
+@@ -47,7 +51,8 @@

                                 unsigned long origin)
  {
        struct ar7_bin_rec header;
                                 unsigned long origin)
  {
        struct ar7_bin_rec header;


@@ -23,7 +21,7 @@ Index: linux-2.6.25.4/drivers/mtd/ar7part.c
        unsigned int pre_size = master->erasesize, post_size = 0;
        unsigned int root_offset = ROOT_OFFSET;
  
        unsigned int pre_size = master->erasesize, post_size = 0;
        unsigned int root_offset = ROOT_OFFSET;
  

-@@ -66,7 +71,7 @@ static int create_mtd_partitions(struct 
+@@ -66,7 +71,7 @@

        do { /* Try 10 blocks starting from master->erasesize */
                offset = pre_size;
                master->read(master, offset,
        do { /* Try 10 blocks starting from master->erasesize */
                offset = pre_size;
                master->read(master, offset,


@@ -32,7 +30,7 @@ Index: linux-2.6.25.4/drivers/mtd/ar7part.c
                if (!strncmp((char *)&header, "TIENV0.8", 8))
                        ar7_parts[1].offset = pre_size;
                if (header.checksum == LOADER_MAGIC1)
                if (!strncmp((char *)&header, "TIENV0.8", 8))
                        ar7_parts[1].offset = pre_size;
                if (header.checksum == LOADER_MAGIC1)

-@@ -88,7 +93,7 @@ static int create_mtd_partitions(struct 
+@@ -88,7 +93,7 @@

                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),
                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),


@@ -41,7 +39,7 @@ Index: linux-2.6.25.4/drivers/mtd/ar7part.c
                }
                root_offset = offset + sizeof(header) + 4;
                break;
                }
                root_offset = offset + sizeof(header) + 4;
                break;

-@@ -96,10 +101,10 @@ static int create_mtd_partitions(struct 
+@@ -96,10 +101,10 @@

                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),
                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),