From 2d379e796f27e7ab4bbc3d5406776722ecba379b Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 23 Aug 2015 18:06:11 +0000 Subject: kernel: update 4.1 to 4.1.6 Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6 Signed-off-by: Jonas Gorski SVN-Revision: 46713 --- target/linux/lantiq/patches-4.1/0101-mtd-split.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/lantiq') diff --git a/target/linux/lantiq/patches-4.1/0101-mtd-split.patch b/target/linux/lantiq/patches-4.1/0101-mtd-split.patch index acda5aae7d..342c66f144 100644 --- a/target/linux/lantiq/patches-4.1/0101-mtd-split.patch +++ b/target/linux/lantiq/patches-4.1/0101-mtd-split.patch @@ -164,7 +164,7 @@ enum mtd_parser_type type, --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -658,7 +658,7 @@ static int mtd_add_partition_attrs(struc +@@ -659,7 +659,7 @@ static int mtd_add_partition_attrs(struc } @@ -173,7 +173,7 @@ __mtd_add_partition(struct mtd_info *master, const char *name, long long offset, long long length, bool dup_check) { -@@ -762,7 +762,7 @@ run_parsers_by_type(struct mtd_part *sla +@@ -763,7 +763,7 @@ run_parsers_by_type(struct mtd_part *sla return nr_parts; } @@ -182,7 +182,7 @@ mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len) { unsigned long mask = mtd->erasesize - 1; -@@ -832,7 +832,6 @@ static void split_uimage(struct mtd_info +@@ -833,7 +833,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; -- cgit v1.2.3