kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38506
This commit is contained in:
@@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
|
||||
CPU_TYPE:=arm926ej-s
|
||||
|
||||
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
|
||||
LINUX_VERSION:=3.10.15
|
||||
LINUX_VERSION:=3.10.17
|
||||
KERNELNAME:="zImage dtbs"
|
||||
|
||||
define Target/Description
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
||||
index f0895c5..3ec78a1 100644
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
|
||||
@@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
|
||||
imx28-cfa10037.dtb \
|
||||
imx28-cfa10049.dtb \
|
||||
imx28-evk.dtb \
|
||||
@@ -10,8 +8,6 @@ index f0895c5..3ec78a1 100644
|
||||
imx28-m28evk.dtb \
|
||||
imx28-sps1.dtb \
|
||||
imx28-tx28.dtb
|
||||
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
|
||||
index 5b62b64..63916c5 100644
|
||||
--- a/arch/arm/mach-mxs/mach-mxs.c
|
||||
+++ b/arch/arm/mach-mxs/mach-mxs.c
|
||||
@@ -175,6 +175,7 @@ enum mac_oui {
|
||||
@@ -22,7 +18,7 @@ index 5b62b64..63916c5 100644
|
||||
};
|
||||
|
||||
static void __init update_fec_mac_prop(enum mac_oui oui)
|
||||
@@ -229,6 +230,11 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
|
||||
@@ -229,6 +230,11 @@ static void __init update_fec_mac_prop(e
|
||||
macaddr[1] = 0xb9;
|
||||
macaddr[2] = 0xe1;
|
||||
break;
|
||||
@@ -46,7 +42,7 @@ index 5b62b64..63916c5 100644
|
||||
static void __init mxs_machine_init(void)
|
||||
{
|
||||
if (of_machine_is_compatible("fsl,imx28-evk"))
|
||||
@@ -372,6 +383,8 @@ static void __init mxs_machine_init(void)
|
||||
@@ -372,6 +383,8 @@ static void __init mxs_machine_init(void
|
||||
cfa10037_init();
|
||||
else if (of_machine_is_compatible("crystalfontz,cfa10049"))
|
||||
cfa10049_init();
|
||||
|
||||
Reference in New Issue
Block a user