diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2014-01-11 16:06:37 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2014-01-11 16:06:37 +0000 |
commit | d3305e8570dba327c25bc62584e2874fbb3d2008 (patch) | |
tree | 6466a8c5f3d798497135e9e56cdc24fbd941602e /target/linux/imx6 | |
parent | 95b66c31118df52b4417fe2e070cbe75aa7d8ade (diff) | |
download | upstream-d3305e8570dba327c25bc62584e2874fbb3d2008.tar.gz upstream-d3305e8570dba327c25bc62584e2874fbb3d2008.tar.bz2 upstream-d3305e8570dba327c25bc62584e2874fbb3d2008.zip |
kernel: update 3.10 to 3.10.26
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39220 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/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index ac14eb21e4..01632ec256 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3 MAINTAINER:=Luka Perkov <luka@openwrt.org> -LINUX_VERSION:=3.10.24 +LINUX_VERSION:=3.10.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch b/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch index ab20f7ff45..95855064d0 100644 --- a/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch +++ b/target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch @@ -47,7 +47,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- a/drivers/of/address.c +++ b/drivers/of/address.c -@@ -231,6 +231,73 @@ int of_pci_address_to_resource(struct de +@@ -223,6 +223,73 @@ int of_pci_address_to_resource(struct de return __of_address_to_resource(dev, addrp, size, flags, NULL, r); } EXPORT_SYMBOL_GPL(of_pci_address_to_resource); |