aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.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/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.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/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch')
-rw-r--r--target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch b/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
index 0a0230fafe..e7cba446f3 100644
--- a/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
+++ b/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
@@ -16,8 +16,6 @@ Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
include/uapi/mtd/ubi-user.h | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
-diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h
-index 9c885e2..1927b0d 100644
--- a/include/uapi/mtd/ubi-user.h
+++ b/include/uapi/mtd/ubi-user.h
@@ -138,9 +138,12 @@
@@ -36,7 +34,7 @@ index 9c885e2..1927b0d 100644
*/
/*
-@@ -199,7 +202,7 @@
+@@ -196,7 +199,7 @@
#define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
struct ubi_set_vol_prop_req)
/* Create a R/O block device on top of an UBI volume */
@@ -45,7 +43,7 @@ index 9c885e2..1927b0d 100644
/* Remove the R/O block device */
#define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
-@@ -431,4 +434,12 @@ struct ubi_set_vol_prop_req {
+@@ -428,4 +431,12 @@ struct ubi_set_vol_prop_req {
__u64 value;
} __packed;
@@ -58,6 +56,3 @@ index 9c885e2..1927b0d 100644
+} __packed;
+
#endif /* __UBI_USER_H__ */
---
-1.9.2
-