ar71xx/image: migrate tl-wr841nd-v1.5 to new build step using squashfs+jffs2 instead...

[oweals/openwrt.git] / target / linux / generic / patches-4.0 / 491-ubi-auto-create-ubiblock-device-for-rootfs.patch

diff --git a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
index 5aafea7366902cd4ffe0d2dcddbc417edfa901b9..433d77b6c11336914147a6748604b0766fd8fe0a 100644 (file)
--- a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
+++ b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -614,6 +614,44 @@ static void __init ubiblock_create_from_
+@@ -616,6 +616,44 @@ static void __init ubiblock_create_from_
        }
  }
  
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +
 +              ret = ubiblock_create(&vi);
 +              if (ret)
-+                      ubi_err("block: can't add '%s' volume, err=%d\n",
++                      pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
 +                              vi.name, ret);
 +              /* always break if we get here */
 +              break;
@@ -56,7 +56,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static void ubiblock_remove_all(void)
  {
        struct ubiblock *next;
-@@ -644,6 +682,10 @@ int __init ubiblock_init(void)
+@@ -646,6 +684,10 @@ int __init ubiblock_init(void)
         */
        ubiblock_create_from_param();