diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 76d079204df113afa9e382a43abb5e1a2135150d (patch) | |
tree | 8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/lantiq/patches-3.18/0101-mtd-split.patch | |
parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
download | upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45711
Diffstat (limited to 'target/linux/lantiq/patches-3.18/0101-mtd-split.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.18/0101-mtd-split.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-3.18/0101-mtd-split.patch b/target/linux/lantiq/patches-3.18/0101-mtd-split.patch index 69c632314c..6753a2156c 100644 --- a/target/linux/lantiq/patches-3.18/0101-mtd-split.patch +++ b/target/linux/lantiq/patches-3.18/0101-mtd-split.patch @@ -164,7 +164,7 @@ enum mtd_parser_type type, --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -630,7 +630,7 @@ out_register: +@@ -627,7 +627,7 @@ out_register: } @@ -173,7 +173,7 @@ __mtd_add_partition(struct mtd_info *master, const char *name, long long offset, long long length, bool dup_check) { -@@ -751,7 +751,7 @@ run_parsers_by_type(struct mtd_part *sla +@@ -748,7 +748,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; -@@ -821,7 +821,6 @@ static void split_uimage(struct mtd_info +@@ -818,7 +818,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; |