aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-24 18:53:14 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-24 18:53:14 +0000
commitf76a752c5768ba7e58fcacf43bef0afd756b81af (patch)
treea3d35129946daa60d66cf6718eaa0e17a2226611 /target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
parent11e93be20d363630dcaca8d2bb7febe2c82ecb06 (diff)
downloadupstream-f76a752c5768ba7e58fcacf43bef0afd756b81af.tar.gz
upstream-f76a752c5768ba7e58fcacf43bef0afd756b81af.tar.bz2
upstream-f76a752c5768ba7e58fcacf43bef0afd756b81af.zip
generic/4.0: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44532
Diffstat (limited to 'target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch')
-rw-r--r--target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch8
1 files changed, 4 insertions, 4 deletions
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 c0ee1f7673..07562b28fc 100644
--- 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;
+@@ -614,6 +614,44 @@ static void __init ubiblock_create_from_
+ }
}
+#define UBIFS_NODE_MAGIC 0x06101831
@@ -57,8 +57,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
{
struct ubiblock *next;
@@ -644,6 +682,10 @@ int __init ubiblock_init(void)
- if (ret)
- goto err_remove;
+ */
+ ubiblock_create_from_param();
+ /* auto-attach "rootfs" volume if existing and non-ubifs */
+ if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))