aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-19 11:12:43 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-19 11:12:43 +0000
commit0f5b1a3ecae01bd64378b898246e006e22c9b539 (patch)
treefff9b91aaed0bc78fb8082de5b431cb9bc977cd5 /target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
parent631e98977b4a4dadde7671f3a35bf3f3a10d11dc (diff)
downloadupstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.gz
upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.bz2
upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.zip
kernel: update 4.0 to 4.0.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46063
Diffstat (limited to 'target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch')
-rw-r--r--target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch b/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
index 1272e3dde2..ea47d3bf0c 100644
--- a/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
+++ b/target/linux/oxnas/patches-4.0/800-oxnas-ehci.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/usb/host/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/usb/host/Kconfig
-+++ linux-4.0-rc4/drivers/usb/host/Kconfig
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
@@ -306,6 +306,13 @@ config USB_OCTEON_EHCI
USB 2.0 device support. All CN6XXX based chips with USB are
supported.
@@ -16,10 +14,8 @@ Index: linux-4.0-rc4/drivers/usb/host/Kconfig
endif # USB_EHCI_HCD
config USB_OXU210HP_HCD
-Index: linux-4.0-rc4/drivers/usb/host/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/usb/host/Makefile
-+++ linux-4.0-rc4/drivers/usb/host/Makefile
+--- a/drivers/usb/host/Makefile
++++ b/drivers/usb/host/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-
obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o