aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2007-07-20 18:32:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2007-07-20 18:32:48 +0000
commit3c7aec61854254868b560e9ab5631910c1ebbebb (patch)
tree1cca232df65c887d983322c685082dde0e53549a
parentcf633b733a3ff9f870b2ab01f206db6b850c1bd2 (diff)
downloadupstream-3c7aec61854254868b560e9ab5631910c1ebbebb.tar.gz
upstream-3c7aec61854254868b560e9ab5631910c1ebbebb.tar.bz2
upstream-3c7aec61854254868b560e9ab5631910c1ebbebb.zip
rootfs_split: fix a typo, and fix compiler warnings
SVN-Revision: 8082
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch2
-rw-r--r--target/linux/generic-2.6/patches/060-rootfs_split.patch4
2 files changed, 3 insertions, 3 deletions
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 67f4764b7b..37d645eb09 100644
--- 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;
+
-+ 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);
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 262d3142d6..adafdaacba 100644
--- 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;
+
-+ 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);
@@ -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];
-+ ret = add_one_partition(master, part, i, &slave);
++ ret = add_one_partition(master, part, j, &slave);
+ if (ret)
+ return ret;
+ j++;