kernel: build the scsi core package even if CONFIG_SCSI=y

[openwrt.git] / package / kernel / modules / usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 8ec76f0..12e9eff 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -7,30 +7,18 @@
 
 USB_MENU:=USB Support
 
-ifeq ($(KERNEL),2.4)
+ifneq ($(CONFIG_LINUX_2_4),)
   USBNET_DIR:=usb/net
 endif
 
-ifeq ($(KERNEL_PATCHVER),2.6.21)
-  USBNET_DIR:=usb/net
-  USBHID_DIR:=usb/input
-  USBINPUT_DIR:=usb/input
-endif
-
 USBNET_DIR?=net/usb
 USBHID_DIR?=hid/usbhid
 USBINPUT_DIR?=input/misc
 
-define usbdep
-  SUBMENU:=$(USB_MENU)
-  DEPENDS:=kmod-usb-core $(1)
-endef
-
-
 define KernelPackage/usb-core
   SUBMENU:=$(USB_MENU)
   TITLE:=Support for USB
-  DEPENDS:=@USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT +LINUX_2_6_31||LINUX_2_6_32:kmod-nls-base
   KCONFIG:=CONFIG_USB
   AUTOLOAD:=$(call AutoLoad,20,usbcore)
 endef
@@ -50,8 +38,14 @@ endef
 $(eval $(call KernelPackage,usb-core))
 
 
+define KernelPackage/usb/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-core $(1)
+endef
+
+
 define KernelPackage/usb-uhci
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Support for UHCI controllers
   KCONFIG:= \
        CONFIG_USB_UHCI_ALT \
@@ -78,7 +72,7 @@ $(eval $(call KernelPackage,usb-uhci))
 
 
 define KernelPackage/usb-uhci-iv
-  $(call usbdep,@LINUX_2_4)
+$(call KernelPackage/usb/Depends,@LINUX_2_4)
   TITLE:=Support for Intel/VIA UHCI controllers
   KCONFIG:=CONFIG_USB_UHCI
   FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
@@ -93,7 +87,7 @@ $(eval $(call KernelPackage,usb-uhci-iv))
 
 
 define KernelPackage/usb-ohci
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Support for OHCI controllers
   KCONFIG:= \
        CONFIG_USB_OHCI \
@@ -121,7 +115,7 @@ $(eval $(call KernelPackage,usb-ohci))
 
 
 define KernelPackage/usb-adm5120
-  $(call usbdep,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le)
+$(call KernelPackage/usb/Depends,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le)
   TITLE:=Support for the ADM5120 HCD controller
   KCONFIG:=CONFIG_USB_ADM5120_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX)
@@ -135,7 +129,7 @@ endef
 $(eval $(call KernelPackage,usb-adm5120))
 
 define KernelPackage/usb-etrax
-  $(call usbdep,@TARGET_etrax)
+$(call KernelPackage/usb/Depends,@TARGET_etrax)
   TITLE:=Support for the ETRAX USB host controller
   KCONFIG:=CONFIG_ETRAX_USB_HOST \
        CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y
@@ -150,7 +144,7 @@ endef
 $(eval $(call KernelPackage,usb-etrax))
 
 define KernelPackage/usb-octeon
-  $(call usbdep,@TARGET_octeon)
+$(call KernelPackage/usb/Depends,@TARGET_octeon)
   TITLE:=Support for the Octeon USB OTG controller
   KCONFIG:=CONFIG_USB_DWC_OTG
   FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.$(LINUX_KMOD_SUFFIX)
@@ -165,7 +159,7 @@ $(eval $(call KernelPackage,usb-octeon))
 
 
 define KernelPackage/usb2
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Support for USB2 controllers
   KCONFIG:=CONFIG_USB_EHCI_HCD \
     CONFIG_USB_EHCI_AR71XX=y
@@ -181,7 +175,7 @@ $(eval $(call KernelPackage,usb2))
 
 
 define KernelPackage/usb-acm
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Support for modems/isdn controllers
   KCONFIG:=CONFIG_USB_ACM
 endef
@@ -204,7 +198,7 @@ $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio
-  $(call usbdep,+kmod-sound-core)
+$(call KernelPackage/usb/Depends,+kmod-sound-core)
   TITLE:=Support for USB audio devices
   KCONFIG:= \
        CONFIG_USB_AUDIO \
@@ -233,7 +227,7 @@ $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Support for printers
   KCONFIG:=CONFIG_USB_PRINTER
 endef
@@ -256,7 +250,7 @@ $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Support for USB-to-Serial converters
   KCONFIG:=CONFIG_USB_SERIAL
   FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)
@@ -270,8 +264,14 @@ endef
 $(eval $(call KernelPackage,usb-serial))
 
 
+define KernelPackage/usb-serial/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-serial $(1)
+endef
+
+
 define KernelPackage/usb-serial-airprime
-  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
   TITLE:=Support for Airprime (EVDO)
   KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
   FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
@@ -286,7 +286,7 @@ $(eval $(call KernelPackage,usb-serial-airprime))
 
 
 define KernelPackage/usb-serial-belkin
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Belkin devices
   KCONFIG:=CONFIG_USB_SERIAL_BELKIN
   FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
@@ -301,7 +301,7 @@ $(eval $(call KernelPackage,usb-serial-belkin))
 
 
 define KernelPackage/usb-serial-ch341
-  $(call usbdep,kmod-usb-serial @LINUX_2_6&&@!LINUX_2_6_23)
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
   TITLE:=Support for CH341 devices
   KCONFIG:=CONFIG_USB_SERIAL_CH341
   FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX)
@@ -316,7 +316,7 @@ $(eval $(call KernelPackage,usb-serial-ch341))
 
 
 define KernelPackage/usb-serial-ftdi
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for FTDI devices
   KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO
   FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
@@ -331,7 +331,7 @@ $(eval $(call KernelPackage,usb-serial-ftdi))
 
 
 define KernelPackage/usb-serial-mct
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Magic Control Tech. devices
   KCONFIG:=CONFIG_USB_SERIAL_MCT_U232
   FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
@@ -346,7 +346,7 @@ $(eval $(call KernelPackage,usb-serial-mct))
 
 
 define KernelPackage/usb-serial-pl2303
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Prolific PL2303 devices
   KCONFIG:=CONFIG_USB_SERIAL_PL2303
   FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
@@ -361,7 +361,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
 define KernelPackage/usb-serial-cp2101
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Silicon Labs cp2101 devices
   KCONFIG:=CONFIG_USB_SERIAL_CP2101
   FILES:=$(LINUX_DIR)/drivers/usb/serial/cp2101.$(LINUX_KMOD_SUFFIX)
@@ -376,7 +376,7 @@ $(eval $(call KernelPackage,usb-serial-cp2101))
 
 
 define KernelPackage/usb-serial-ark3116
-  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
   TITLE:=Support for ArkMicroChips ARK3116 devices
   KCONFIG:=CONFIG_USB_SERIAL_ARK3116
   FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX)
@@ -391,7 +391,7 @@ $(eval $(call KernelPackage,usb-serial-ark3116))
 
 
 define KernelPackage/usb-serial-oti6858
-  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
   TITLE:=Support for Ours Technology OTI6858 devices
   KCONFIG:=CONFIG_USB_SERIAL_OTI6858
   FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX)
@@ -406,7 +406,7 @@ $(eval $(call KernelPackage,usb-serial-oti6858))
 
 
 define KernelPackage/usb-serial-sierrawireless
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Sierra Wireless devices
   KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
   FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX)
@@ -421,7 +421,7 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless))
 
 
 define KernelPackage/usb-serial-motorola-phone
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Motorola usb phone
   KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA
   FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX)
@@ -437,7 +437,7 @@ $(eval $(call KernelPackage,usb-serial-motorola-phone))
 
 
 define KernelPackage/usb-serial-visor
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Handspring Visor devices
   KCONFIG:=CONFIG_USB_SERIAL_VISOR
   FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
@@ -452,7 +452,7 @@ $(eval $(call KernelPackage,usb-serial-visor))
 
 
 define KernelPackage/usb-serial-keyspan
-  $(call usbdep,kmod-usb-serial)
+$(call KernelPackage/usb-serial/Depends,)
   TITLE:=Support for Keyspan USB-to-Serial devices
   KCONFIG:= \
        CONFIG_USB_SERIAL_KEYSPAN \
@@ -480,7 +480,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan))
 
 
 define KernelPackage/usb-serial-option
-  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
   TITLE:=Support for Option HSDPA modems
   KCONFIG:=CONFIG_USB_SERIAL_OPTION
   FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX)
@@ -495,7 +495,7 @@ $(eval $(call KernelPackage,usb-serial-option))
 
 
 define KernelPackage/usb-storage
-  $(call usbdep,+kmod-scsi-core)
+$(call KernelPackage/usb/Depends,+kmod-scsi-core)
   TITLE:=USB Storage support
   KCONFIG:=CONFIG_USB_STORAGE
   FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
@@ -510,11 +510,11 @@ $(eval $(call KernelPackage,usb-storage))
 
 
 define KernelPackage/usb-video
-  $(call usbdep,@LINUX_2_6)
+$(call KernelPackage/usb/Depends,@LINUX_2_6)
   TITLE:=Support for USB video devices
   KCONFIG:=CONFIG_VIDEO_USBVIDEO
   FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,usbvideo)
+  AUTOLOAD:=$(call AutoLoad,61,usbvideo)
 endef
 
 define KernelPackage/usb-video/description
@@ -525,7 +525,7 @@ $(eval $(call KernelPackage,usb-video))
 
 
 define KernelPackage/usb-atm
-  $(call usbdep,@LINUX_2_6 +kmod-atm)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-atm)
   TITLE:=Support for ATM on USB bus
   KCONFIG:=CONFIG_USB_ATM
   FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX)
@@ -539,8 +539,14 @@ endef
 $(eval $(call KernelPackage,usb-atm))
 
 
+define KernelPackage/usb-atm/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-atm $(1)
+endef
+
+
 define KernelPackage/usb-atm-speedtouch
-  $(call usbdep,kmod-usb-atm @LINUX_2_6)
+$(call KernelPackage/usb-atm/Depends,@LINUX_2_6)
   TITLE:=SpeedTouch USB ADSL modems support
   KCONFIG:=CONFIG_USB_SPEEDTOUCH
   FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
@@ -555,7 +561,7 @@ $(eval $(call KernelPackage,usb-atm-speedtouch))
 
 
 define KernelPackage/usb-atm-ueagle
-  $(call usbdep,kmod-usb-atm @LINUX_2_6)
+$(call KernelPackage/usb-atm/Depends,@LINUX_2_6)
   TITLE:=Eagle 8051 based USB ADSL modems support
   FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_USB_UEAGLEATM
@@ -568,8 +574,9 @@ endef
 
 $(eval $(call KernelPackage,usb-atm-ueagle))
 
+
 define KernelPackage/usb-atm-cxacru
-  $(call usbdep,kmod-usb-atm @LINUX_2_6)
+$(call KernelPackage/usb-atm/Depends,@LINUX_2_6)
   TITLE:=cxacru
   FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_USB_CXACRU
@@ -584,7 +591,7 @@ $(eval $(call KernelPackage,usb-atm-cxacru))
 
 
 define KernelPackage/usb-net
-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
   KCONFIG:=CONFIG_USB_USBNET
   AUTOLOAD:=$(call AutoLoad,60,usbnet)
@@ -605,8 +612,14 @@ endef
 $(eval $(call KernelPackage,usb-net))
 
 
+define KernelPackage/usb-net/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-net $(1)
+endef
+
+
 define KernelPackage/usb-net-asix
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Asix convertors
   KCONFIG:=CONFIG_USB_NET_AX8817X
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
@@ -621,7 +634,7 @@ $(eval $(call KernelPackage,usb-net-asix))
 
 
 define KernelPackage/usb-net-hso
-  $(call usbdep,kmod-usb-net @LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_23 @!LINUX_2_6_24 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill)
   TITLE:=Kernel module for Option USB High Speed Mobile Devices
   KCONFIG:=CONFIG_USB_HSO
   FILES:= \
@@ -637,7 +650,7 @@ $(eval $(call KernelPackage,usb-net-hso))
 
 
 define KernelPackage/usb-net-kaweth
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
   KCONFIG:=CONFIG_USB_KAWETH
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX)
@@ -652,7 +665,7 @@ $(eval $(call KernelPackage,usb-net-kaweth))
 
 
 define KernelPackage/usb-net-pegasus
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
   KCONFIG:=CONFIG_USB_PEGASUS
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX)
@@ -667,7 +680,7 @@ $(eval $(call KernelPackage,usb-net-pegasus))
 
 
 define KernelPackage/usb-net-mcs7830
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
   TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors
   KCONFIG:=CONFIG_USB_NET_MCS7830
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX)
@@ -680,8 +693,9 @@ endef
 
 $(eval $(call KernelPackage,usb-net-mcs7830))
 
+
 define KernelPackage/usb-net-dm9601-ether
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
   TITLE:=Support for DM9601 ethernet connections
   KCONFIG:=CONFIG_USB_NET_DM9601
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX)
@@ -695,7 +709,7 @@ endef
 $(eval $(call KernelPackage,usb-net-dm9601-ether))
 
 define KernelPackage/usb-net-cdc-ether
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
   TITLE:=Support for cdc ethernet connections
   KCONFIG:=CONFIG_USB_NET_CDCETHER
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX)
@@ -710,9 +724,8 @@ $(eval $(call KernelPackage,usb-net-cdc-ether))
 
 
 define KernelPackage/usb-net-rndis
-  $(call usbdep,kmod-usb-net @LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +kmod-usb-net-cdc-ether)
   TITLE:=Support for RNDIS connections
-  DEPENDS:=+kmod-usb-net-cdc-ether
   KCONFIG:=CONFIG_USB_NET_RNDIS_HOST 
   FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,62,rndis_host)
@@ -726,7 +739,7 @@ $(eval $(call KernelPackage,usb-net-rndis))
 
 
 define KernelPackage/usb-hid
-  $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-hid)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-hid)
   TITLE:=Support for USB Human Input Devices
   KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID
   FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
@@ -742,7 +755,7 @@ $(eval $(call KernelPackage,usb-hid))
 
 
 define KernelPackage/usb-yealink
-  $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
   TITLE:=USB Yealink VOIP phone
   KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
   FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
@@ -757,7 +770,7 @@ $(eval $(call KernelPackage,usb-yealink))
 
 
 define KernelPackage/usb-cm109
-  $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
   TITLE:=Support for CM109 device
   KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y
   FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko
@@ -772,7 +785,7 @@ $(eval $(call KernelPackage,usb-cm109))
 
 
 define KernelPackage/usb-test
-  $(call usbdep,@LINUX_2_6 @DEVEL)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 @DEVEL)
   TITLE:=USB Testing Driver
   KCONFIG:=CONFIG_USB_TEST
   FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko
@@ -784,8 +797,9 @@ endef
 
 $(eval $(call KernelPackage,usb-test))
 
+
 define KernelPackage/usb-phidget
-  $(call usbdep,@LINUX_2_6)
+$(call KernelPackage/usb/Depends,@LINUX_2_6)
   TITLE:=USB Phidget Driver
   KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO
   FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko