aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-06-11 23:39:54 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-11 23:39:54 +0000
commita6e15f806007d56125f6309a874137d0389afa00 (patch)
tree2f644a92979c5e91a2286f5d34025473853a1546 /target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
parentf64c27686bf84e7d480ea516c78c241b2e5dd985 (diff)
downloadmaster-187ad058-a6e15f806007d56125f6309a874137d0389afa00.tar.gz
master-187ad058-a6e15f806007d56125f6309a874137d0389afa00.tar.bz2
master-187ad058-a6e15f806007d56125f6309a874137d0389afa00.zip
kernel: update 3.14 to 3.14.7
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41150 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch')
-rw-r--r--target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
index 4ceedf30f8..cea598d674 100644
--- a/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
+++ b/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
@@ -9,8 +9,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
drivers/mtd/ubi/block.c | 10 ++++++++++
1 file changed, 10 insertions(+)
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 2dbe2f4..eaa29f8 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -48,6 +48,7 @@
@@ -21,7 +19,7 @@ index 2dbe2f4..eaa29f8 100644
#include "ubi-media.h"
#include "ubi.h"
-@@ -444,6 +445,15 @@ int ubiblock_create(struct ubi_volume_info *vi)
+@@ -444,6 +445,15 @@ int ubiblock_create(struct ubi_volume_in
add_disk(dev->gd);
ubi_msg("%s created from ubi%d:%d(%s)",
dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
@@ -37,6 +35,3 @@ index 2dbe2f4..eaa29f8 100644
return 0;
out_free_queue:
---
-1.9.2
-