From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 29 Jan 2015 21:58:57 +0000 (+0000)
Subject: linux: fix kmod-usbip* for >= 3.17
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3fda4c9866e60e91e8d5051b2f8a1be6e502b627;p=openwrt%2Fstaging%2Fyousong.git

linux: fix kmod-usbip* for >= 3.17

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44204
---

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 2499af1007..ecbf18668d 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1359,7 +1359,9 @@ define KernelPackage/usbip
   KCONFIG:= \
 	CONFIG_USBIP_CORE \
 	CONFIG_USBIP_DEBUG=n
-  FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip-core.ko
+  FILES:= \
+	$(LINUX_DIR)/drivers/staging/usbip/usbip-core.ko@lt3.17 \
+	$(LINUX_DIR)/drivers/usb/usbip/usbip-core.ko@ge3.17
   AUTOLOAD:=$(call AutoProbe,usbip-core)
   $(call AddDepends/usb)
 endef
@@ -1371,7 +1373,9 @@ define KernelPackage/usbip-client
   TITLE := USB-over-IP client driver
   DEPENDS := +kmod-usbip
   KCONFIG := CONFIG_USBIP_VHCI_HCD
-  FILES := $(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX)
+  FILES := \
+	$(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.ko@lt3.17 \
+	$(LINUX_DIR)/drivers/usb/usbip/vhci-hcd.ko@ge3.17
   AUTOLOAD := $(call AutoProbe,vhci-hcd)
   $(call AddDepends/usb)
 endef
@@ -1384,7 +1388,9 @@ $(call KernelPackage/usbip/Default)
   TITLE := USB-over-IP host driver
   DEPENDS := +kmod-usbip
   KCONFIG := CONFIG_USBIP_HOST
-  FILES := $(LINUX_DIR)/drivers/staging/usbip/usbip-host.ko
+  FILES := \
+	$(LINUX_DIR)/drivers/staging/usbip/usbip-host.ko@lt3.17 \
+	$(LINUX_DIR)/drivers/usb/usbip/usbip-host.ko@ge3.17
   AUTOLOAD := $(call AutoProbe,usbip-host)
   $(call AddDepends/usb)
 endef