[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 060-block2mtd_init.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
index b331f73..fff857f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
-===================================================================
---- linux-2.6.23-rc6.orig/drivers/mtd/devices/block2mtd.c      2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c   2007-09-21 16:23:59.000000000 +0800
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c

 @@ -16,6 +16,7 @@
  #include <linux/list.h>
  #include <linux/init.h>
 @@ -16,6 +16,7 @@
  #include <linux/list.h>
  #include <linux/init.h>


@@ -10,7 +8,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>

-@@ -237,10 +238,11 @@
+@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct

  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */


@@ -23,7 +21,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  
        if (!devname)
                return NULL;
  
        if (!devname)
                return NULL;

-@@ -279,14 +281,18 @@
+@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(

  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */


@@ -47,7 +45,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;

-@@ -298,15 +304,18 @@
+@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(

        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;


@@ -70,7 +68,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        return dev;
  
  devinit_err:
        return dev;
  
  devinit_err:

-@@ -379,9 +388,9 @@
+@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]

  
  static int block2mtd_setup2(const char *val)
  {
  
  static int block2mtd_setup2(const char *val)
  {


@@ -82,7 +80,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;

-@@ -392,7 +401,7 @@
+@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *

        strcpy(str, val);
        kill_final_newline(str);
  
        strcpy(str, val);
        kill_final_newline(str);
  


@@ -91,7 +89,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
                token[i] = strsep(&str, ",");
  
        if (str)
                token[i] = strsep(&str, ",");
  
        if (str)

-@@ -412,8 +421,10 @@
+@@ -412,8 +421,10 @@ static int block2mtd_setup2(const char *

                        parse_err("illegal erase size");
                }
        }
                        parse_err("illegal erase size");
                }
        }


@@ -103,7 +101,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c
  
        return 0;
  }
  
        return 0;
  }

-@@ -447,7 +458,7 @@
+@@ -447,7 +458,7 @@ static int block2mtd_setup(const char *v

  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);