Use a more explicit variable name for the number of dhcp leases (#2240)

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.22 / 060-rootfs_split.patch

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 c8fe052b839295c5a1824acec13bcbf1b2c04a94..37d645eb092c4275eb78462bb5cf648c20f9028f 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
@@ -252,8 +252,8 @@ Index: linux/drivers/mtd/mtdpart.c
 +              goto out;
 +      }
 +
-+      part->name = (unsigned char *)&part[1];
 +      memcpy(part, old, sizeof(*part));
++      part->name = (unsigned char *)&part[1];
 +      strcpy(part->name, ROOTFS_SPLIT_NAME);
 +
 +      len = (u32) sb->bytes_used;
@@ -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);
@@ -461,7 +461,7 @@ Index: linux/drivers/mtd/mtdpart.c
 +              j++;
 +
 +              if (strcmp(part->name, "rootfs") == 0 && slave->registered) {
-+#if CONFIG_MTD_ROOTFS_ROOT_DEV
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
 +                      if (ROOT_DEV == 0) {
 +                              printk(KERN_NOTICE "mtd: partition \"rootfs\" "
 +                                      "set to be root filesystem\n");
@@ -480,7 +480,7 @@ Index: linux/drivers/mtd/mtdpart.c
 -                      add_mtd_device(&slave->mtd);
 -                      slave->registered = 1;
 +#endif
-+#if CONFIG_MTD_ROOTFS_SPLIT
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
 +                      ret = split_rootfs_data(master, part, j);
 +                      if (ret == 0)
 +                              j++;