add the R_ARM_V4BX relocation to the ARM kernel module loader

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

diff --git a/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch
index 6fb0be1..4f046b4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch
@@ -8,7 +8,7 @@
  #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 */


@@ -21,7 +21,7 @@
  
        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 */


@@ -44,7 +44,7 @@
        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;

-@@ -299,14 +305,17 @@
+@@ -299,14 +305,17 @@ static struct block2mtd_dev *add_device(

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


@@ -65,7 +65,7 @@
        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)
  {


@@ -77,7 +77,7 @@
        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);
  


@@ -86,7 +86,7 @@
                token[i] = strsep(&str, ",");
  
        if (str)
                token[i] = strsep(&str, ",");
  
        if (str)

-@@ -411,8 +420,10 @@
+@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *

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


@@ -98,7 +98,7 @@
  
        return 0;
  }
  
        return 0;
  }

-@@ -446,7 +457,7 @@
+@@ -446,7 +457,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);