aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.10
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-11-05 08:25:45 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-11-05 08:25:45 +0000
commit35656042f1cd457819a75c980613634b494a7e70 (patch)
treef7999960f435d3eeacf3bc222cf249f3df368969 /target/linux/lantiq/patches-3.10
parentcb07269988cd3be7cbbd3278081c5688ae8d7616 (diff)
downloadupstream-35656042f1cd457819a75c980613634b494a7e70.tar.gz
upstream-35656042f1cd457819a75c980613634b494a7e70.tar.bz2
upstream-35656042f1cd457819a75c980613634b494a7e70.zip
kernel: update 3.10 to 3.10.18
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38652
Diffstat (limited to 'target/linux/lantiq/patches-3.10')
-rw-r--r--target/linux/lantiq/patches-3.10/0100-mtd-split.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
index 056f5177fa..1911b4451e 100644
--- a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
+++ b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
@@ -164,7 +164,7 @@
enum mtd_parser_type type,
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -616,7 +616,7 @@ out_register:
+@@ -615,7 +615,7 @@ out_register:
}
@@ -173,7 +173,7 @@
__mtd_add_partition(struct mtd_info *master, char *name,
long long offset, long long length, bool dup_check)
{
-@@ -737,7 +737,7 @@ run_parsers_by_type(struct mtd_part *sla
+@@ -736,7 +736,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;
-@@ -806,7 +806,6 @@ static void split_uimage(struct mtd_info
+@@ -805,7 +805,6 @@ static void split_uimage(struct mtd_info
return;
len = be32_to_cpu(hdr.size) + 0x40;