rootfs_split: fix a typo, and fix compiler warnings

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8082 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch
index 67f4764..37d645e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch
@@ -284,7 +284,7 @@ Index: linux/drivers/mtd/mtdpart.c
 +      if (dpart == NULL)
 +              return 1;
 +
 +      if (dpart == NULL)
 +              return 1;
 +

-+      printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%lX, len=%lX \n",
++      printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%X, len=%X \n",

 +              ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
 +
 +      ret = add_one_partition(master, dpart, index, NULL);
 +              ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
 +
 +      ret = add_one_partition(master, dpart, index, NULL);

diff --git a/target/linux/generic-2.6/patches/060-rootfs_split.patch b/target/linux/generic-2.6/patches/060-rootfs_split.patch
index 262d314..adafdaa 100644 (file)
--- a/target/linux/generic-2.6/patches/060-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches/060-rootfs_split.patch
@@ -285,7 +285,7 @@ Index: linux/drivers/mtd/mtdpart.c
 +      if (dpart == NULL)
 +              return 1;
 +
 +      if (dpart == NULL)
 +              return 1;
 +

-+      printk(KERN_INFO "mtd: \"%s\" created, ofs=%lX, len=%lX \n",
++      printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%X, len=%X \n",

 +              ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
 +
 +      ret = add_one_partition(master, dpart, index, NULL);
 +              ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
 +
 +      ret = add_one_partition(master, dpart, index, NULL);


@@ -457,7 +457,7 @@ Index: linux/drivers/mtd/mtdpart.c
 -                              offs += slave->mtd.erasesize;
 +      for (i = 0, j = 0; i < nbparts; i++) {
 +              part = (struct mtd_partition *) &parts[i];
 -                              offs += slave->mtd.erasesize;
 +      for (i = 0, j = 0; i < nbparts; i++) {
 +              part = (struct mtd_partition *) &parts[i];

-+              ret = add_one_partition(master, part, i, &slave);
++              ret = add_one_partition(master, part, j, &slave);

 +              if (ret)
 +                      return ret;
 +              j++;
 +              if (ret)
 +                      return ret;
 +              j++;