aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.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
commitf45b1a671a2bfb4b74a0a45f49723a78d270764b (patch)
treedf2cea987db125da27fe150e04929430b17624a3 /target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
parent089f09592693276db9735d76640986fad9be7ade (diff)
downloadupstream-f45b1a671a2bfb4b74a0a45f49723a78d270764b.tar.gz
upstream-f45b1a671a2bfb4b74a0a45f49723a78d270764b.tar.bz2
upstream-f45b1a671a2bfb4b74a0a45f49723a78d270764b.zip
kernel: update 3.14 to 3.14.7
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 41150
Diffstat (limited to 'target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch')
-rw-r--r--target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch5
1 files changed, 0 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch b/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
index 0a0230fafe..e9aab2a181 100644
--- a/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
+++ b/target/linux/generic/patches-3.14/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 @@
@@ -58,6 +56,3 @@ index 9c885e2..1927b0d 100644
+} __packed;
+
#endif /* __UBI_USER_H__ */
---
-1.9.2
-