diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-01-11 16:06:37 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-01-11 16:06:37 +0000 |
| commit | 7310d079ac49721b2c7727529c9f6c746e8f183a (patch) | |
| tree | 6466a8c5f3d798497135e9e56cdc24fbd941602e /target/linux/kirkwood | |
| parent | 0d384d4eeb498928a8d718fe91b801a2001b12f8 (diff) | |
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/kirkwood')
| -rw-r--r-- | target/linux/kirkwood/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 0b44512642..66399fb9b2 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand ubifs CPU_TYPE:=xscale MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.24 +LINUX_VERSION:=3.10.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch b/target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch index a3a5aca3fb..88100d6196 100644 --- a/target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch +++ b/target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch @@ -50,7 +50,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); |