add missing kernel config symbols for usb on powerpc

[openwrt.git] / target / linux / generic / patches-2.6.37 / 400-rootfs_split.patch

diff --git a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
index 1f61bfd..d7003a9 100644 (file)
--- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@ -111,8 +111,8 @@
 +      }
 +
 +      memcpy(dpart, part, sizeof(*part));
++      strcpy((char *)&dpart[1], ROOTFS_SPLIT_NAME);
 +      dpart->name = (unsigned char *)&dpart[1];
-+      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
 +
 +      dpart->size = rpart->size - (split_offset - spart->offset);
 +      dpart->offset = split_offset;
@@ -193,7 +193,7 @@
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
-@@ -633,7 +782,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -633,7 +784,7 @@ int add_mtd_partitions(struct mtd_info *
  {
        struct mtd_part *slave;
        uint64_t cur_offset = 0;
@@ -202,7 +202,7 @@
  
        printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
  
-@@ -648,6 +797,21 @@ int add_mtd_partitions(struct mtd_info *
+@@ -648,6 +799,21 @@ int add_mtd_partitions(struct mtd_info *
  
                add_mtd_device(&slave->mtd);
  
@@ -224,7 +224,7 @@
                cur_offset = slave->offset + slave->mtd.size;
        }
  
-@@ -655,6 +819,32 @@ int add_mtd_partitions(struct mtd_info *
+@@ -655,6 +821,32 @@ int add_mtd_partitions(struct mtd_info *
  }
  EXPORT_SYMBOL(add_mtd_partitions);
  
@@ -259,7 +259,7 @@
  
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file, 
+@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
                file->f_pos = 0;
                break;
        }
@@ -301,7 +301,8 @@
  
 +struct mtd_partition;
  struct mtd_partition {
-       char *name;                     /* identifier string */
+-      char *name;                     /* identifier string */
++      const char *name;               /* identifier string */
        uint64_t size;                  /* partition size */
        uint64_t offset;                /* offset within the master MTD space */
        uint32_t mask_flags;            /* master MTD flags to mask out for this partition */