diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-11-05 08:25:45 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-11-05 08:25:45 +0000 |
commit | 61fef497bbe02a4a5955b9246ade876d7027f5cf (patch) | |
tree | 5dc258adc647d10c5431fbc84cc5eb38b47a1a00 /target/linux/lantiq | |
parent | ad2ef19154ff4c0e3546a1be36b6a802467edbb2 (diff) |
kernel: update 3.10 to 3.10.18
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38652 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r-- | target/linux/lantiq/Makefile | 2 | ||||
-rw-r--r-- | target/linux/lantiq/patches-3.10/0100-mtd-split.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 7b15754012..35d0a8b2b3 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP FEATURES:=squashfs SUBTARGETS=xway xrx200 ase falcon -LINUX_VERSION:=3.10.17 +LINUX_VERSION:=3.10.18 CPU_TYPE:=mips32r2 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; |