aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-06-26 13:47:46 +0000
committerJohn Crispin <blogic@openwrt.org>2014-06-26 13:47:46 +0000
commita5a86f528d940531f3a24eb3c1b1e66fac492852 (patch)
tree8b2d6f407b83ede3ebd2a3bb4f42970d5e8ea50a /target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
parent994485877673c5eafe8626e28a805f6ce91cf609 (diff)
downloadupstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.gz
upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.bz2
upstream-a5a86f528d940531f3a24eb3c1b1e66fac492852.zip
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41352 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch')
-rw-r--r--target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
index e1992c9a29..3d59b44472 100644
--- a/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
+++ b/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -9,11 +9,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
-diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
-index 8d659e6..2dbe2f4 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
-@@ -593,6 +593,44 @@ static int __init ubiblock_create_from_param(void)
+@@ -593,6 +593,44 @@ static int __init ubiblock_create_from_p
return ret;
}
@@ -69,6 +67,3 @@ index 8d659e6..2dbe2f4 100644
/*
* Block devices are only created upon user requests, so we ignore
* existing volumes.
---
-1.9.2
-