aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@freemail.hu>2017-12-13 21:56:03 +0100
committerJohn Crispin <john@phrozen.org>2017-12-15 23:57:09 +0100
commitc13b4ef2c8a796fb1d1fb95e2ab5185a69479b22 (patch)
tree740a528ddc8d4ea6c2aff81dbf8f078f6aa5e1f0 /target/linux
parenta9940ca2d7afb4f287c9799ab17d292e83cc03df (diff)
downloadupstream-c13b4ef2c8a796fb1d1fb95e2ab5185a69479b22.tar.gz
upstream-c13b4ef2c8a796fb1d1fb95e2ab5185a69479b22.tar.bz2
upstream-c13b4ef2c8a796fb1d1fb95e2ab5185a69479b22.zip
kernel: fix compiler warning in mtdsplit_minor.c under 4.4
When mtdsplit_minor.c is compiled under Linux 4.4, the compiler drops the following warning: CC drivers/mtd/mtdsplit/mtdsplit_minor.o drivers/mtd/mtdsplit/mtdsplit_minor.c:106:14: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .parse_fn = mtdsplit_parse_minor, ^ drivers/mtd/mtdsplit/mtdsplit_minor.c:106:14: note: (near initialization for 'mtdsplit_minor_parser.parse_fn') The second parameter of the parser function must not have a 'const' qualifier in 4.4. The 001-mtdsplit_backport.patch removes the qualifier from other partition parsers. Update it to handle mtdsplit_minor.c as well. Signed-off-by: Gabor Juhos <juhosg@freemail.hu>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/pending-4.4/001-mtdsplit_backport.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic/pending-4.4/001-mtdsplit_backport.patch b/target/linux/generic/pending-4.4/001-mtdsplit_backport.patch
index 97cd62d75c..f0839b6b90 100644
--- a/target/linux/generic/pending-4.4/001-mtdsplit_backport.patch
+++ b/target/linux/generic/pending-4.4/001-mtdsplit_backport.patch
@@ -140,3 +140,14 @@
{
struct wrgg03_header hdr;
size_t hdr_len, retlen, kernel_ent_size;
+--- a/drivers/mtd/mtdsplit/mtdsplit_minor.c
++++ b/drivers/mtd/mtdsplit/mtdsplit_minor.c
+@@ -49,7 +49,7 @@ struct minor_header {
+ };
+
+ static int mtdsplit_parse_minor(struct mtd_info *master,
+- const struct mtd_partition **pparts,
++ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+ {
+ struct minor_header hdr;