kernel: update 3.14 to 3.14.7

[openwrt.git] / target / linux / generic / patches-3.14 / 492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch

diff --git a/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index 75a0bc0..c36dbe3 100644 (file)
--- a/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -9,8 +9,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  init/do_mounts.c | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 
  init/do_mounts.c | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 

-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..faba9c6 100644

 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
 @@ -432,7 +432,27 @@ retry:
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
 @@ -432,7 +432,27 @@ retry:


@@ -53,6 +51,3 @@ index 82f2288..faba9c6 100644
  #ifdef CONFIG_BLOCK
        create_dev("/dev/root", ROOT_DEV);
        mount_block_root("/dev/root", root_mountflags);
  #ifdef CONFIG_BLOCK
        create_dev("/dev/root", ROOT_DEV);
        mount_block_root("/dev/root", root_mountflags);

--- 
-1.9.2
-