aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-09-27 07:19:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-09-27 07:19:21 +0000
commit9c8a5ef1153e3402d8e8c69715bcfdef55c1ea4a (patch)
treeca0acec0c1c17a0ae42ce056f0518f4aeb83963f /target/linux/lantiq
parent1d89a89667e24e7f69710fd96c89696220facc92 (diff)
downloadupstream-9c8a5ef1153e3402d8e8c69715bcfdef55c1ea4a.tar.gz
upstream-9c8a5ef1153e3402d8e8c69715bcfdef55c1ea4a.tar.bz2
upstream-9c8a5ef1153e3402d8e8c69715bcfdef55c1ea4a.zip
kernel: update 3.10 to 3.10.13
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38228
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/Makefile2
-rw-r--r--target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch2
-rw-r--r--target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index fa98788318..9ac2a13b3e 100644
--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
FEATURES:=squashfs
SUBTARGETS=xway xrx200 ase falcon
-LINUX_VERSION:=3.10.12
+LINUX_VERSION:=3.10.13
CPU_TYPE:=mips32r2
diff --git a/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch
index ce1412aa86..9329e15315 100644
--- a/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch
+++ b/target/linux/lantiq/patches-3.10/0001-MIPS-lantiq-add-pcie-driver.patch
@@ -5527,7 +5527,7 @@ Subject: [PATCH 01/34] MIPS: lantiq: add pcie driver
unsigned long type);
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -1042,6 +1042,12 @@
+@@ -1044,6 +1044,12 @@
#define PCI_DEVICE_ID_SGI_LITHIUM 0x1002
#define PCI_DEVICE_ID_SGI_IOC4 0x100a
diff --git a/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch b/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch
index 559a6b8c3d..22526cfb7c 100644
--- a/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch
+++ b/target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch
@@ -20,7 +20,7 @@ Subject: [PATCH 32/34] USB: fix roothub for IFXHCD
choice
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -4041,7 +4041,7 @@ hub_port_init (struct usb_hub *hub, stru
+@@ -4036,7 +4036,7 @@ hub_port_init (struct usb_hub *hub, stru
udev->ttport = hdev->ttport;
} else if (udev->speed != USB_SPEED_HIGH
&& hdev->speed == USB_SPEED_HIGH) {