diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-09-02 10:18:15 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-09-02 10:18:15 +0000 |
| commit | 7d6cff4882e1484e09956e19825acdae3a68618c (patch) | |
| tree | 76a46ad583bca975dd2cb71f20543fa2c1eee425 /target/linux/lantiq/patches-3.18 | |
| parent | 7747092ed1d906b247d834735941d995a62c5556 (diff) | |
| download | upstream-7d6cff4882e1484e09956e19825acdae3a68618c.tar.gz upstream-7d6cff4882e1484e09956e19825acdae3a68618c.tar.bz2 upstream-7d6cff4882e1484e09956e19825acdae3a68618c.zip | |
kernel: update 3.18 to 3.18.21
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.21
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46768
Diffstat (limited to 'target/linux/lantiq/patches-3.18')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch | 2 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0101-mtd-split.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-3.18/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch b/target/linux/lantiq/patches-3.18/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch index 819eb322cb..4f655db499 100644 --- a/target/linux/lantiq/patches-3.18/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch +++ b/target/linux/lantiq/patches-3.18/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch @@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -553,6 +553,16 @@ config I2C_KEMPLD +@@ -554,6 +554,16 @@ config I2C_KEMPLD This driver can also be built as a module. If so, the module will be called i2c-kempld. 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 6753a2156c..6152e0e211 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 -@@ -627,7 +627,7 @@ out_register: +@@ -628,7 +628,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) { -@@ -748,7 +748,7 @@ run_parsers_by_type(struct mtd_part *sla +@@ -749,7 +749,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; -@@ -818,7 +818,6 @@ static void split_uimage(struct mtd_info +@@ -819,7 +819,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; |