diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-24 18:53:14 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-24 18:53:14 +0000 |
| commit | aba8ca6df21d9d39352aad1d4e85845505955528 (patch) | |
| tree | e96d52efd638433b45e08314144092a9f041cfec /target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch | |
| parent | 6ebdada8c78252e91ec2f1f1c8f3230f2261f955 (diff) | |
| download | upstream-aba8ca6df21d9d39352aad1d4e85845505955528.tar.gz upstream-aba8ca6df21d9d39352aad1d4e85845505955528.tar.bz2 upstream-aba8ca6df21d9d39352aad1d4e85845505955528.zip | |
generic/4.0: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44532 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 8 |
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)) |