aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-26 13:47:46 +0000
committerJohn Crispin <john@openwrt.org>2014-06-26 13:47:46 +0000
commitfbf8b288e1f318cb697f4a86cbe01b4b9573b82d (patch)
treeb955ff887aea2a971b9f6a69c12330b085791107 /target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
parent994e5ce2f93bf8beeb099a9fd38d1dc358005c30 (diff)
downloadupstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.gz
upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.bz2
upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.zip
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41352
Diffstat (limited to 'target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch')
-rw-r--r--target/linux/generic/patches-3.10/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.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
index 4ceedf30f8..cea598d674 100644
--- a/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
+++ b/target/linux/generic/patches-3.10/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
-