kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38506
This commit is contained in:
@@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
|
||||
FEATURES:=squashfs
|
||||
SUBTARGETS=xway xrx200 ase falcon
|
||||
|
||||
LINUX_VERSION:=3.10.15
|
||||
LINUX_VERSION:=3.10.17
|
||||
|
||||
CPU_TYPE:=mips32r2
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-3.10.13/arch/mips/lantiq/xway/Makefile
|
||||
===================================================================
|
||||
--- linux-3.10.13.orig/arch/mips/lantiq/xway/Makefile 2013-10-01 00:07:55.165279437 +0200
|
||||
+++ linux-3.10.13/arch/mips/lantiq/xway/Makefile 2013-10-01 00:10:24.269285811 +0200
|
||||
--- a/arch/mips/lantiq/xway/Makefile
|
||||
+++ b/arch/mips/lantiq/xway/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
|
||||
|
||||
@@ -10,10 +8,8 @@ Index: linux-3.10.13/arch/mips/lantiq/xway/Makefile
|
||||
|
||||
obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o
|
||||
|
||||
Index: linux-3.10.13/arch/mips/lantiq/xway/mtd_split.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-3.10.13/arch/mips/lantiq/xway/mtd_split.c 2013-10-01 00:11:28.745288566 +0200
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/lantiq/xway/mtd_split.c
|
||||
@@ -0,0 +1,129 @@
|
||||
+#include <linux/magic.h>
|
||||
+#include <linux/root_dev.h>
|
||||
@@ -144,11 +140,9 @@ Index: linux-3.10.13/arch/mips/lantiq/xway/mtd_split.c
|
||||
+ split_eva_kernel(master, name, offset, size);
|
||||
+ split_brnimage_kernel(master, name, offset, size);
|
||||
+}
|
||||
Index: linux-3.10.13/include/linux/mtd/partitions.h
|
||||
===================================================================
|
||||
--- linux-3.10.13.orig/include/linux/mtd/partitions.h 2013-10-01 00:07:55.165279437 +0200
|
||||
+++ linux-3.10.13/include/linux/mtd/partitions.h 2013-10-01 00:08:03.889279810 +0200
|
||||
@@ -89,12 +89,17 @@
|
||||
--- a/include/linux/mtd/partitions.h
|
||||
+++ b/include/linux/mtd/partitions.h
|
||||
@@ -89,12 +89,17 @@ extern int deregister_mtd_parser(struct
|
||||
int mtd_is_partition(const struct mtd_info *mtd);
|
||||
int mtd_add_partition(struct mtd_info *master, char *name,
|
||||
long long offset, long long length);
|
||||
@@ -168,11 +162,9 @@ Index: linux-3.10.13/include/linux/mtd/partitions.h
|
||||
|
||||
int parse_mtd_partitions_by_type(struct mtd_info *master,
|
||||
enum mtd_parser_type type,
|
||||
Index: linux-3.10.13/drivers/mtd/mtdpart.c
|
||||
===================================================================
|
||||
--- linux-3.10.13.orig/drivers/mtd/mtdpart.c 2013-10-01 00:07:55.165279437 +0200
|
||||
+++ linux-3.10.13/drivers/mtd/mtdpart.c 2013-10-01 00:08:03.893279810 +0200
|
||||
@@ -616,7 +616,7 @@
|
||||
--- a/drivers/mtd/mtdpart.c
|
||||
+++ b/drivers/mtd/mtdpart.c
|
||||
@@ -616,7 +616,7 @@ out_register:
|
||||
}
|
||||
|
||||
|
||||
@@ -181,7 +173,7 @@ Index: linux-3.10.13/drivers/mtd/mtdpart.c
|
||||
__mtd_add_partition(struct mtd_info *master, char *name,
|
||||
long long offset, long long length, bool dup_check)
|
||||
{
|
||||
@@ -737,7 +737,7 @@
|
||||
@@ -737,7 +737,7 @@ run_parsers_by_type(struct mtd_part *sla
|
||||
return nr_parts;
|
||||
}
|
||||
|
||||
@@ -190,7 +182,7 @@ Index: linux-3.10.13/drivers/mtd/mtdpart.c
|
||||
mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
|
||||
{
|
||||
unsigned long mask = mtd->erasesize - 1;
|
||||
@@ -806,7 +806,6 @@
|
||||
@@ -806,7 +806,6 @@ static void split_uimage(struct mtd_info
|
||||
return;
|
||||
|
||||
len = be32_to_cpu(hdr.size) + 0x40;
|
||||
|
||||
Reference in New Issue
Block a user