aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-12-01 09:59:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-12-01 09:59:53 +0000
commit892e13e5c9f228ad2d2595276a2804bdf6bdb772 (patch)
tree06a344df2e534c08c5652423d26acb7cbadea364 /target/linux/lantiq
parentff2bdbe3b4429e7cfe82a5f1230ba75d394ebb31 (diff)
downloadupstream-892e13e5c9f228ad2d2595276a2804bdf6bdb772.tar.gz
upstream-892e13e5c9f228ad2d2595276a2804bdf6bdb772.tar.bz2
upstream-892e13e5c9f228ad2d2595276a2804bdf6bdb772.zip
kernel: update 3.10 to 3.10.21
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38972 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/Makefile2
-rw-r--r--target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index 35d0a8b2b3..8a7f88d5ce 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.18
+LINUX_VERSION:=3.10.21
CPU_TYPE:=mips32r2
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 22526cfb7c..78aadd173f 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
-@@ -4036,7 +4036,7 @@ hub_port_init (struct usb_hub *hub, stru
+@@ -4053,7 +4053,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) {