dnsmasq: Don't add local hostname if ula prefix is not specified

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 406-mtd-old-rootfs-squashfs-splitter.patch

diff --git a/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch b/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch
index ca819584321be55a84afd469f6ef0738db4eb815..cc548efb60e1bb5a5b8c340cdfd2a1650a361274 100644 (file)
--- a/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch
+++ b/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch
@@ -14,7 +14,7 @@
        default y
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -681,6 +681,47 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+@@ -682,6 +682,47 @@ mtd_pad_erasesize(struct mtd_info *mtd,
        return len;
  }
  
@@ -62,7 +62,7 @@
  #define UBOOT_MAGIC   0x27051956
  
  static void split_uimage(struct mtd_info *master, struct mtd_part *part)
-@@ -743,7 +784,10 @@ static void mtd_partition_split(struct m
+@@ -744,7 +785,10 @@ static void mtd_partition_split(struct m
                return;
  
        if (!strcmp(part->mtd.name, "rootfs")) {