diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-10-23 12:51:05 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-10-23 12:51:05 +0000 |
| commit | 56e1cd4a8e3d806ff92e710c0409165847b2e7af (patch) | |
| tree | a82433e4101b7b069458cf66d826c4ebd9bbe7c5 /target/linux/cns21xx | |
| parent | 4805656f76b5ac07882c66bb81bc294d4b441571 (diff) | |
| download | upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.tar.gz upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.tar.bz2 upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.zip | |
kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38506 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns21xx')
| -rw-r--r-- | target/linux/cns21xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index f010d5a3d7..09032729e9 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs CPU_TYPE:=fa526 -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch b/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch index a1b2d82344..db4fecac8c 100644 --- a/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch +++ b/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c -@@ -695,6 +695,9 @@ retry: +@@ -697,6 +697,9 @@ retry: periodic_reinit (ohci); @@ -10,7 +10,7 @@ /* some OHCI implementations are finicky about how they init. * bogus values here mean not even enumeration could work. */ -@@ -1189,6 +1192,11 @@ MODULE_LICENSE ("GPL"); +@@ -1191,6 +1194,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ohci_hcd_tilegx_driver #endif @@ -22,7 +22,7 @@ #ifdef CONFIG_USB_OHCI_HCD_PLATFORM #include "ohci-platform.c" #define PLATFORM_DRIVER ohci_platform_driver -@@ -1209,7 +1217,8 @@ MODULE_LICENSE ("GPL"); +@@ -1211,7 +1219,8 @@ MODULE_LICENSE ("GPL"); !defined(AT91_PLATFORM_DRIVER) && \ !defined(NXP_PLATFORM_DRIVER) && \ !defined(DAVINCI_PLATFORM_DRIVER) && \ @@ -32,7 +32,7 @@ #error "missing bus glue for ohci-hcd" #endif -@@ -1329,9 +1338,19 @@ static int __init ohci_hcd_mod_init(void +@@ -1331,9 +1340,19 @@ static int __init ohci_hcd_mod_init(void goto error_spear; #endif @@ -52,7 +52,7 @@ #ifdef SPEAR_PLATFORM_DRIVER platform_driver_unregister(&SPEAR_PLATFORM_DRIVER); error_spear: -@@ -1409,6 +1428,9 @@ module_init(ohci_hcd_mod_init); +@@ -1411,6 +1430,9 @@ module_init(ohci_hcd_mod_init); static void __exit ohci_hcd_mod_exit(void) { |