kernel: refresh generic patches

[openwrt.git] / target / linux / generic / patches-3.10 / 047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch

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 0a0230f..e7cba44 100644 (file)
--- 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
-