From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Feb 2014 20:30:24 +0000 (+0000)
Subject: kernel: fix kmod-usb-phy-nop
X-Git-Tag: fast2504n-3.10.28-merged~92
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b4144ee2b03809cc82cef63e277a69b306de1321;p=openwrt.git

kernel: fix kmod-usb-phy-nop

phy-generic.ko was renamed and moved from kernel version to version.
kernel <= 3.9: nop-usb-xceiv.ko
kernel >= 3.10 && <= 3.11: phy-nop.ko
kernel >= 3.12: phy-generic.ko

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39563 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index a75d3e2fc9..7c16fe7973 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -102,8 +102,18 @@ $(eval $(call KernelPackage,usb-musb-tusb6010))
 define KernelPackage/usb-phy-nop
   TITLE:=Support for USB NOP transceiver
   KCONFIG:=CONFIG_NOP_USB_XCEIV
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-generic.ko),)
   FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-generic.ko
   AUTOLOAD:=$(call AutoLoad,43,phy-generic)
+else
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-nop.ko),)
+  FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-nop.ko
+  AUTOLOAD:=$(call AutoLoad,43,phy-nop)
+else
+  FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko
+  AUTOLOAD:=$(call AutoLoad,43,nop-usb-xceiv)
+endif
+endif
   $(call AddDepends/usb)
 endef