From 554772a66547afa10bc7fc3040f3bf9259728c60 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 15 Sep 2013 16:00:41 +0000 Subject: kernel: update 3.10 to 3.10.12 Signed-off-by: Gabor Juhos SVN-Revision: 38000 --- target/linux/imx6/Makefile | 2 +- target/linux/imx6/patches-3.10/200-imx6_pcie.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/imx6') diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index b26e4818c1..6eccacbaf7 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -13,7 +13,7 @@ FEATURES:=audio display gpio pcie usb usbgadget squashfs targz CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp MAINTAINER:=Luka Perkov -LINUX_VERSION:=3.10.10 +LINUX_VERSION:=3.10.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx6/patches-3.10/200-imx6_pcie.patch b/target/linux/imx6/patches-3.10/200-imx6_pcie.patch index 6aee13fb70..534ce9e9f8 100644 --- a/target/linux/imx6/patches-3.10/200-imx6_pcie.patch +++ b/target/linux/imx6/patches-3.10/200-imx6_pcie.patch @@ -1,7 +1,7 @@ --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi -@@ -382,6 +382,15 @@ - }; +@@ -391,6 +391,15 @@ + status = "disabled"; }; + pcie: pcie@01ffc000 { -- cgit v1.2.3