aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/001-mtdsplit_backport.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-28 11:01:46 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-10 11:48:44 +0100
commit4e38fc824c8ed69fd0adbcc5a98b9a6476dde657 (patch)
treeca85b05ed24b2fc53e709b2f3c0a3c4b5c5e9293 /target/linux/generic/pending-3.18/001-mtdsplit_backport.patch
parent8c0f6a010a5b7011acbbf2ac5b345d9cf1c14b1f (diff)
downloadupstream-4e38fc824c8ed69fd0adbcc5a98b9a6476dde657.tar.gz
upstream-4e38fc824c8ed69fd0adbcc5a98b9a6476dde657.tar.bz2
upstream-4e38fc824c8ed69fd0adbcc5a98b9a6476dde657.zip
kernel: bump 3.18 to 3.18.128
Refreshed all patches. Altered patches: - 002-phy_drivers_backport.patch Compile-tested on: adm5120 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/001-mtdsplit_backport.patch')
-rw-r--r--target/linux/generic/pending-3.18/001-mtdsplit_backport.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-3.18/001-mtdsplit_backport.patch b/target/linux/generic/pending-3.18/001-mtdsplit_backport.patch
index f0f2effbe4..f64a568fbc 100644
--- a/target/linux/generic/pending-3.18/001-mtdsplit_backport.patch
+++ b/target/linux/generic/pending-3.18/001-mtdsplit_backport.patch
@@ -67,7 +67,7 @@
struct mtd_partition *part;
--- a/drivers/mtd/mtdsplit/mtdsplit_tplink.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_tplink.c
-@@ -83,8 +83,8 @@ struct tplink_fw_header {
+@@ -84,8 +84,8 @@ struct tplink_fw_header {
};
static int mtdsplit_parse_tplink(struct mtd_info *master,
@@ -91,7 +91,7 @@
struct mtd_partition *parts;
--- a/drivers/mtd/mtdsplit/mtdsplit_uimage.c
+++ b/drivers/mtd/mtdsplit/mtdsplit_uimage.c
-@@ -81,7 +81,7 @@ read_uimage_header(struct mtd_info *mtd,
+@@ -82,7 +82,7 @@ read_uimage_header(struct mtd_info *mtd,
* of a valid uImage header if found
*/
static int __mtdsplit_parse_uimage(struct mtd_info *master,
@@ -100,7 +100,7 @@
struct mtd_part_parser_data *data,
ssize_t (*find_header)(u_char *buf, size_t len))
{
-@@ -232,7 +232,7 @@ static ssize_t uimage_verify_default(u_c
+@@ -233,7 +233,7 @@ static ssize_t uimage_verify_default(u_c
static int
mtdsplit_uimage_parse_generic(struct mtd_info *master,
@@ -109,7 +109,7 @@
struct mtd_part_parser_data *data)
{
return __mtdsplit_parse_uimage(master, pparts, data,
-@@ -289,7 +289,7 @@ static ssize_t uimage_verify_wndr3700(u_
+@@ -300,7 +300,7 @@ static ssize_t uimage_verify_wndr3700(u_
static int
mtdsplit_uimage_parse_netgear(struct mtd_info *master,
@@ -118,7 +118,7 @@
struct mtd_part_parser_data *data)
{
return __mtdsplit_parse_uimage(master, pparts, data,
-@@ -331,7 +331,7 @@ static ssize_t uimage_find_edimax(u_char
+@@ -352,7 +352,7 @@ static ssize_t uimage_find_edimax(u_char
static int
mtdsplit_uimage_parse_edimax(struct mtd_info *master,