diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-15 16:00:41 +0000 |
| commit | 2d7844c116b6fca17535d5d0f99a22b12323e94a (patch) | |
| tree | d4d295fb2cbe10aa39502d39d7094bc7149e2990 /target/linux/imx6 | |
| parent | 463cdf78fa5e8bca6e7ed00bd1e5af8e099d2982 (diff) | |
| download | upstream-2d7844c116b6fca17535d5d0f99a22b12323e94a.tar.gz upstream-2d7844c116b6fca17535d5d0f99a22b12323e94a.tar.bz2 upstream-2d7844c116b6fca17535d5d0f99a22b12323e94a.zip | |
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
| -rw-r--r-- | target/linux/imx6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/imx6/patches-3.10/200-imx6_pcie.patch | 4 |
2 files changed, 3 insertions, 3 deletions
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 <luka@openwrt.org> -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 { |