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 c0ee1f7673fd18e2930c80c0cca559a675a81bf6..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,8 +11,8 @@ 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 int __init ubiblock_create_from_p
-       return ret;
+@@ -616,6 +616,44 @@ static void __init ubiblock_create_from_
+       }
  }
  
 +#define UBIFS_NODE_MAGIC  0x06101831
@@ -56,9 +56,9 @@ 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)
-       if (ret)
-               goto err_remove;
+@@ -646,6 +684,10 @@ int __init ubiblock_init(void)
+        */
+       ubiblock_create_from_param();
  
 +      /* auto-attach "rootfs" volume if existing and non-ubifs */
 +      if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))