diff options
author | Luka Perkov <luka@openwrt.org> | 2014-06-11 23:39:54 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-06-11 23:39:54 +0000 |
commit | a6e15f806007d56125f6309a874137d0389afa00 (patch) | |
tree | 2f644a92979c5e91a2286f5d34025473853a1546 /target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch | |
parent | f64c27686bf84e7d480ea516c78c241b2e5dd985 (diff) | |
download | upstream-a6e15f806007d56125f6309a874137d0389afa00.tar.gz upstream-a6e15f806007d56125f6309a874137d0389afa00.tar.bz2 upstream-a6e15f806007d56125f6309a874137d0389afa00.zip |
kernel: update 3.14 to 3.14.7
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41150 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch b/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch index a010a3cf4a..ec71b05252 100644 --- a/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch +++ b/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch @@ -16,8 +16,6 @@ Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> include/uapi/mtd/ubi-user.h | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) -diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c -index 16e6731..69a74fd 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -32,7 +32,7 @@ @@ -29,11 +27,9 @@ index 16e6731..69a74fd 100644 */ #include <linux/module.h> -diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c -index 11c8473..f54562a 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c -@@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, +@@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file * break; } @@ -44,7 +40,7 @@ index 11c8473..f54562a 100644 { struct ubi_volume_info vi; -@@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, +@@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file * break; } @@ -55,8 +51,6 @@ index 11c8473..f54562a 100644 { struct ubi_volume_info vi; -diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h -index b98585a..9c885e2 100644 --- a/include/uapi/mtd/ubi-user.h +++ b/include/uapi/mtd/ubi-user.h @@ -138,9 +138,9 @@ @@ -87,6 +81,3 @@ index b98585a..9c885e2 100644 /* Maximum MTD device name length supported by UBI */ #define MAX_UBI_MTD_NAME_LEN 127 --- -1.9.2 - |