mac80211: rename a misnamed patch

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 4f41294..ee5c9f7 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -1,347 +1,949 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 

-USBMENU:=USB Support
+USB_MENU:=USB Support
+
+USBNET_DIR:=net/usb
+USBHID_DIR?=hid/usbhid
+USBINPUT_DIR?=input/misc

 
 define KernelPackage/usb-core
 
 define KernelPackage/usb-core

+  SUBMENU:=$(USB_MENU)

   TITLE:=Support for USB
   TITLE:=Support for USB

-  DESCRIPTION:=Kernel support for USB
-  DEPENDS:=@USB_SUPPORT
-  KCONFIG:=$(CONFIG_USB)
-  SUBMENU:=$(USBMENU)
-  AUTOLOAD:=$(call AutoLoad,20,usbcore)
+  DEPENDS:=@USB_SUPPORT +kmod-nls-base
+  KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n
+  FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko
+  AUTOLOAD:=$(call AutoLoad,20,usbcore,1)

 endef
 
 endef
 

-define KernelPackage/usb-core/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)
+define KernelPackage/usb-core/description
+ Kernel support for USB

 endef
 
 endef
 

-define KernelPackage/usb-core/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX)
-endef

 $(eval $(call KernelPackage,usb-core))
 
 
 $(eval $(call KernelPackage,usb-core))
 
 

-define KernelPackage/usb-uhci
-  TITLE:=Support for UHCI controllers
-  DESCRIPTION:=Kernel support for USB UHCI controllers
-  DEPENDS:=kmod-usb-core
-  SUBMENU:=$(USBMENU)
+define AddDepends/usb
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=+!TARGET_etrax:kmod-usb-core $(1)
+endef
+
+
+define KernelPackage/usb-gadget
+  TITLE:=USB Gadget support
+  KCONFIG:=CONFIG_USB_GADGET
+  FILES:=
+  AUTOLOAD:=
+  DEPENDS:=@USB_GADGET_SUPPORT
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-gadget/description
+  Kernel support for USB Gadget mode.
+endef
+
+$(eval $(call KernelPackage,usb-gadget))
+
+
+define KernelPackage/usb-eth-gadget
+  TITLE:=USB Ethernet Gadget support
+  KCONFIG:= \
+       CONFIG_USB_ETH \
+       CONFIG_USB_ETH_RNDIS=y \
+       CONFIG_USB_ETH_EEM=y
+  DEPENDS:=+kmod-usb-gadget
+  FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
+  AUTOLOAD:=$(call AutoLoad,52,g_ether)
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-uhci/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
-  KCONFIG:=$(CONFIG_USB_UHCI_ALT)
-  AUTOLOAD:=$(call AutoLoad,50,uhci)
+define KernelPackage/usb-eth-gadget/description
+  Kernel support for USB Ethernet Gadget.

 endef
 
 endef
 

-define KernelPackage/usb-uhci/2.6
+$(eval $(call KernelPackage,usb-eth-gadget))
+
+
+define KernelPackage/usb-uhci
+  TITLE:=Support for UHCI controllers
+  KCONFIG:= \
+       CONFIG_USB_UHCI_ALT \
+       CONFIG_USB_UHCI_HCD

   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko

-  KCONFIG:=$(CONFIG_USB_UHCI_HCD)
-  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
+  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd,1)
+  $(call AddDepends/usb)

 endef
 endef

-$(eval $(call KernelPackage,usb-uhci))

 
 

-define KernelPackage/usb-uhci-iv
-  TITLE:=Support for Intel/VIA UHCI controllers 
-  DESCRIPTION:=Kernel support for Intel/VIA USB UHCI controllers
-  DEPENDS:=kmod-usb-core @LINUX_2_4
-  SUBMENU:=$(USBMENU)
-endef 
+define KernelPackage/usb-uhci/description
+ Kernel support for USB UHCI controllers
+endef
+
+$(eval $(call KernelPackage,usb-uhci,1))

 
 

-define KernelPackage/usb-uhci-iv/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_USB_UHCI)
-  AUTOLOAD:=$(call AutoLoad,50,usb-uhci) 
-endef 
-$(eval $(call KernelPackage,usb-uhci-iv)) 

 
 define KernelPackage/usb-ohci
   TITLE:=Support for OHCI controllers
 
 define KernelPackage/usb-ohci
   TITLE:=Support for OHCI controllers

-  DESCRIPTION:=Kernel support for USB OHCI controllers
-  DEPENDS:=kmod-usb-core
-  SUBMENU:=$(USBMENU)
+  KCONFIG:= \
+       CONFIG_USB_OHCI \
+       CONFIG_USB_OHCI_HCD \
+       CONFIG_USB_OHCI_AR71XX=y \
+       CONFIG_USB_OCTEON_OHCI=y
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-ohci/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o
-  KCONFIG:=$(CONFIG_USB_OHCI)
-  AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
+define KernelPackage/usb-ohci/description
+ Kernel support for USB OHCI controllers

 endef
 
 endef
 

-define KernelPackage/usb-ohci/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
-  KCONFIG:=$(CONFIG_USB_OHCI_HCD)
-  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
+$(eval $(call KernelPackage,usb-ohci,1))
+
+
+define KernelPackage/musb-hdrc
+  TITLE:=Support for Mentor Graphics silicon dual role USB
+  KCONFIG:= \
+       CONFIG_USB_MUSB_HDRC \
+       CONFIG_MUSB_PIO_ONLY=n \
+       CONFIG_USB_MUSB_OTG=y \
+       CONFIG_USB_MUSB_DEBUG=y
+  DEPENDS:=@TARGET_omap24xx
+  FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko
+  AUTOLOAD:=$(call AutoLoad,46,musb_hdrc)
+  $(call AddDepends/usb)

 endef
 endef

-$(eval $(call KernelPackage,usb-ohci))

 
 

-define KernelPackage/usb2
-  TITLE:=Support for USB2 controllers
-  DESCRIPTION:=Kernel support for USB2 (EHCI) controllers
-  DEPENDS:=kmod-usb-core
-  KCONFIG:=$(CONFIG_USB)
-  SUBMENU:=$(USBMENU)
-  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_USB_EHCI_HCD)
-  AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
+define KernelPackage/musb-hdrc/description
+  Kernel support for Mentor Graphics silicon dual role USB device.

 endef
 endef

-$(eval $(call KernelPackage,usb2))

 
 

+$(eval $(call KernelPackage,musb-hdrc))

 
 

-define usbdep
-  SUBMENU:=$(USBMENU)
-  DEPENDS:=kmod-usb-core $(1)
+
+define KernelPackage/nop-usb-xceiv
+  TITLE:=Support for USB OTG NOP transceiver
+  KCONFIG:= \
+       CONFIG_NOP_USB_XCEIV
+  DEPENDS:=@TARGET_omap24xx
+  FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko
+  AUTOLOAD:=$(call AutoLoad,45,nop-usb-xceiv)
+  $(call AddDepends/usb)

 endef
 
 endef
 

+define KernelPackage/nop-usb-xceiv/description
+  Support for USB OTG NOP transceiver
+endef

 
 

-define KernelPackage/usb-acm
-  $(call usbdep,)
-  TITLE:=Support for modems/isdn controllers
-  DESCRIPTION:=Kernel support for USB ACM devices (modems/isdn controllers)
-  KCONFIG:=$(CONFIG_USB_ACM)
+$(eval $(call KernelPackage,nop-usb-xceiv))
+
+
+define KernelPackage/tusb6010
+  TITLE:=Support for TUSB 6010
+  KCONFIG:= \
+       CONFIG_USB_TUSB6010=y
+  DEPENDS:=+kmod-musb-hdrc +kmod-nop-usb-xceiv
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-acm/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/acm.o
-  AUTOLOAD:=$(call AutoLoad,60,acm)
+define KernelPackage/tusb6010/description
+  TUSB6010 support

 endef
 
 endef
 

-define KernelPackage/usb-acm/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko
-  AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
+$(eval $(call KernelPackage,tusb6010))
+
+
+define KernelPackage/usb-tahvo
+  TITLE:=Support for Tahvo (Nokia n810) USB
+  KCONFIG:= \
+       CONFIG_CBUS_TAHVO_USB \
+       CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT=n \
+       CONFIG_USB_OHCI_HCD_OMAP1=y \
+       CONFIG_USB_GADGET_DEBUG_FS=n
+  DEPENDS:=@TARGET_omap24xx +kmod-tusb6010 +kmod-usb-gadget
+  FILES:=$(LINUX_DIR)/drivers/cbus/tahvo-usb.ko
+  AUTOLOAD:=$(call AutoLoad,45,tahvo-usb)
+  $(call AddDepends/usb)

 endef
 endef

-$(eval $(call KernelPackage,usb-acm))

 
 

+define KernelPackage/usb-tahvo/description
+  Kernel support for Nokia n810 USB OHCI controller.
+endef

 
 

-define KernelPackage/usb-audio
-  $(call usbdep,+kmod-soundcore)
-  TITLE:=Support for audio devices
-  DESCRIPTION:=Kernel support for USB audio devices
+$(eval $(call KernelPackage,usb-tahvo))
+
+
+define KernelPackage/usb-isp116x-hcd
+  TITLE:=Support for the ISP116x USB Host Controller
+  DEPENDS:=@TARGET_ppc40x
+  KCONFIG:= \
+       CONFIG_USB_ISP116X_HCD \
+       CONFIG_USB_ISP116X_HCD_OF=y \
+       CONFIG_USB_ISP116X_HCD_PLATFORM=n
+  FILES:=$(LINUX_DIR)/drivers/usb/host/isp116x-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,50,isp116x-hcd)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-isp116x-hcd/description
+  Kernel support for the ISP116X USB Host Controller
+endef
+
+$(eval $(call KernelPackage,usb-isp116x-hcd))
+
+
+define KernelPackage/usb2
+  TITLE:=Support for USB2 controllers
+  KCONFIG:=CONFIG_USB_EHCI_HCD \
+    CONFIG_USB_EHCI_AR71XX=y \
+    CONFIG_USB_OCTEON_EHCI=y \
+    CONFIG_USB_EHCI_FSL=n
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1)
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-audio/2.4
-  KCONFIG:=$(CONFIG_USB_AUDIO)
-  FILES:=$(LINUX_DIR)/drivers/usb/audio.o
-  AUTOLOAD:=$(call AutoLoad,60,audio)
+define KernelPackage/usb2/description
+ Kernel support for USB2 (EHCI) controllers

 endef
 
 endef
 

-define KernelPackage/usb-audio/2.6
-  KCONFIG:=$(CONFIG_SND_USB_AUDIO)
+$(eval $(call KernelPackage,usb2))
+
+
+define KernelPackage/usb-acm
+  TITLE:=Support for modems/isdn controllers
+  KCONFIG:=CONFIG_USB_ACM
+  FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko
+  AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
+$(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-acm/description
+ Kernel support for USB ACM devices (modems/isdn controllers)
+endef
+
+$(eval $(call KernelPackage,usb-acm))
+
+
+define KernelPackage/usb-audio
+  TITLE:=Support for USB audio devices
+  KCONFIG:= \
+       CONFIG_USB_AUDIO \
+       CONFIG_SND_USB_AUDIO
+  $(call AddDepends/usb)
+  $(call AddDepends/sound)
+# For Linux 2.6.35+
+ifneq ($(wildcard $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko),)
+  FILES:= \
+       $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \
+       $(LINUX_DIR)/sound/usb/snd-usb-audio.ko
+  AUTOLOAD:=$(call AutoLoad,60,snd-usbmidi-lib snd-usb-audio)
+else

   FILES:= \
        $(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
        $(LINUX_DIR)/sound/usb/snd-usb-audio.ko
   AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
   FILES:= \
        $(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
        $(LINUX_DIR)/sound/usb/snd-usb-audio.ko
   AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)

+endif

 endef
 endef

+
+define KernelPackage/usb-audio/description
+ Kernel support for USB audio devices
+endef
+

 $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer
 $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer

-  $(call usbdep,)

   TITLE:=Support for printers
   TITLE:=Support for printers

-  DESCRIPTION:=Kernel support for USB printers
-  KCONFIG:=$(CONFIG_USB_PRINTER)
+  KCONFIG:=CONFIG_USB_PRINTER
+  FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko
+  AUTOLOAD:=$(call AutoLoad,60,usblp)
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-printer/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/printer.o
-  AUTOLOAD:=$(call AutoLoad,60,printer)
+define KernelPackage/usb-printer/description
+ Kernel support for USB printers

 endef
 
 endef
 

-define KernelPackage/usb-printer/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko
-  AUTOLOAD:=$(call AutoLoad,60,usblp)
-endef

 $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial
 $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial

-  $(call usbdep,)

   TITLE:=Support for USB-to-Serial converters
   TITLE:=Support for USB-to-Serial converters

-  DESCRIPTION:=Kernel support for USB-to-Serial converters
-  KCONFIG:=$(CONFIG_USB_SERIAL)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.ko

   AUTOLOAD:=$(call AutoLoad,60,usbserial)
   AUTOLOAD:=$(call AutoLoad,60,usbserial)

+  $(call AddDepends/usb)

 endef
 endef

+
+define KernelPackage/usb-serial/description
+ Kernel support for USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial))
 
 $(eval $(call KernelPackage,usb-serial))
 

+
+define AddDepends/usb-serial
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=kmod-usb-serial $(1)
+endef
+
+

 define KernelPackage/usb-serial-airprime
 define KernelPackage/usb-serial-airprime

-  TITLE:=Support for Airprime (EVDO) 
-  DESCRIPTION:=Kernel support for Airprime (EVDO) 
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_AIRPRIME)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
+  TITLE:=Support for Airprime (EVDO)
+  KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.ko

   AUTOLOAD:=$(call AutoLoad,65,airprime)
   AUTOLOAD:=$(call AutoLoad,65,airprime)

+  $(call AddDepends/usb-serial)

 endef
 endef

+
+define KernelPackage/usb-serial-airprime/description
+ Kernel support for Airprime (EVDO)
+endef
+

 $(eval $(call KernelPackage,usb-serial-airprime))
 
 $(eval $(call KernelPackage,usb-serial-airprime))
 

+

 define KernelPackage/usb-serial-belkin
   TITLE:=Support for Belkin devices
 define KernelPackage/usb-serial-belkin
   TITLE:=Support for Belkin devices

-  DESCRIPTION:=Kernel support for Belkin USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_BELKIN)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_BELKIN
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.ko

   AUTOLOAD:=$(call AutoLoad,65,belkin_sa)
   AUTOLOAD:=$(call AutoLoad,65,belkin_sa)

+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-belkin/description
+ Kernel support for Belkin USB-to-Serial converters

 endef
 endef

+

 $(eval $(call KernelPackage,usb-serial-belkin))
 
 
 $(eval $(call KernelPackage,usb-serial-belkin))
 
 

+define KernelPackage/usb-serial-ch341
+  TITLE:=Support for CH341 devices
+  KCONFIG:=CONFIG_USB_SERIAL_CH341
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.ko
+  AUTOLOAD:=$(call AutoLoad,65,ch341)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ch341/description
+ Kernel support for Winchiphead CH341 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ch341))
+
+

 define KernelPackage/usb-serial-ftdi
   TITLE:=Support for FTDI devices
 define KernelPackage/usb-serial-ftdi
   TITLE:=Support for FTDI devices

-  DESCRIPTION:=Kernel support for FTDI USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_FTDI_SIO)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.ko

   AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)
   AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)

+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ftdi/description
+ Kernel support for FTDI USB-to-Serial converters

 endef
 endef

+

 $(eval $(call KernelPackage,usb-serial-ftdi))
 
 
 $(eval $(call KernelPackage,usb-serial-ftdi))
 
 

+define KernelPackage/usb-serial-ipw
+  TITLE:=Support for IPWireless 3G devices
+  KCONFIG:=CONFIG_USB_SERIAL_IPW
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ipw.ko
+  AUTOLOAD:=$(call AutoLoad,65,ipw)
+  $(call AddDepends/usb-serial)
+endef
+
+$(eval $(call KernelPackage,usb-serial-ipw))
+
+

 define KernelPackage/usb-serial-mct
   TITLE:=Support for Magic Control Tech. devices
 define KernelPackage/usb-serial-mct
   TITLE:=Support for Magic Control Tech. devices

-  DESCRIPTION:=Kernel support for Magic Control Technology USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_MCT_U232)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_MCT_U232
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.ko

   AUTOLOAD:=$(call AutoLoad,65,mct_u232)
   AUTOLOAD:=$(call AutoLoad,65,mct_u232)

+  $(call AddDepends/usb-serial)

 endef
 endef

+
+define KernelPackage/usb-serial-mct/description
+ Kernel support for Magic Control Technology USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial-mct))
 
 $(eval $(call KernelPackage,usb-serial-mct))
 

+
+define KernelPackage/usb-serial-mos7720
+  TITLE:=Support for Moschip MOS7720 devices
+  KCONFIG:=CONFIG_USB_SERIAL_MOS7720
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/mos7720.ko
+  AUTOLOAD:=$(call AutoLoad,65,mos7720)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-mos7720/description
+ Kernel support for Moschip MOS7720 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-mos7720))
+
+

 define KernelPackage/usb-serial-pl2303
   TITLE:=Support for Prolific PL2303 devices
 define KernelPackage/usb-serial-pl2303
   TITLE:=Support for Prolific PL2303 devices

-  DESCRIPTION:=Kernel support for Prolific PL2303 USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_PL2303)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_PL2303
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.ko

   AUTOLOAD:=$(call AutoLoad,65,pl2303)
   AUTOLOAD:=$(call AutoLoad,65,pl2303)

+  $(call AddDepends/usb-serial)

 endef
 endef

+
+define KernelPackage/usb-serial-pl2303/description
+ Kernel support for Prolific PL2303 USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 

+define KernelPackage/usb-serial-cp210x
+  TITLE:=Support for Silicon Labs cp210x devices
+  KCONFIG:=CONFIG_USB_SERIAL_CP210X
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.ko
+  AUTOLOAD:=$(call AutoLoad,65,cp210x)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-cp210x/description
+ Kernel support for Silicon Labs cp210x USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-cp210x))
+
+
+define KernelPackage/usb-serial-ark3116
+  TITLE:=Support for ArkMicroChips ARK3116 devices
+  KCONFIG:=CONFIG_USB_SERIAL_ARK3116
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.ko
+  AUTOLOAD:=$(call AutoLoad,65,ark3116)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ark3116/description
+ Kernel support for ArkMicroChips ARK3116 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ark3116))
+
+
+define KernelPackage/usb-serial-oti6858
+  TITLE:=Support for Ours Technology OTI6858 devices
+  KCONFIG:=CONFIG_USB_SERIAL_OTI6858
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.ko
+  AUTOLOAD:=$(call AutoLoad,65,oti6858)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-oti6858/description
+ Kernel support for Ours Technology OTI6858 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-oti6858))
+
+

 define KernelPackage/usb-serial-sierrawireless
   TITLE:=Support for Sierra Wireless devices
 define KernelPackage/usb-serial-sierrawireless
   TITLE:=Support for Sierra Wireless devices

-  DESCRIPTION:=Kernel support for Sierra Wireless devices
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_SIERRAWIRELESS)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.ko

   AUTOLOAD:=$(call AutoLoad,65,sierra)
   AUTOLOAD:=$(call AutoLoad,65,sierra)

+  $(call AddDepends/usb-serial)

 endef
 endef

+
+define KernelPackage/usb-serial-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+

 $(eval $(call KernelPackage,usb-serial-sierrawireless))
 
 
 $(eval $(call KernelPackage,usb-serial-sierrawireless))
 
 

+define KernelPackage/usb-serial-motorola-phone
+  TITLE:=Support for Motorola usb phone
+  KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.ko
+  AUTOLOAD:=$(call AutoLoad,65,moto_modem)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-motorola-phone/description
+ Kernel support for Motorola usb phone
+endef
+
+$(eval $(call KernelPackage,usb-serial-motorola-phone))
+
+

 define KernelPackage/usb-serial-visor
   TITLE:=Support for Handspring Visor devices
 define KernelPackage/usb-serial-visor
   TITLE:=Support for Handspring Visor devices

-  DESCRIPTION:=Kernel support for Handspring Visor PDAs
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_VISOR)
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_VISOR
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.ko

   AUTOLOAD:=$(call AutoLoad,65,visor)
   AUTOLOAD:=$(call AutoLoad,65,visor)

+  $(call AddDepends/usb-serial)

 endef
 endef

+
+define KernelPackage/usb-serial-visor/description
+ Kernel support for Handspring Visor PDAs
+endef
+

 $(eval $(call KernelPackage,usb-serial-visor))
 
 
 $(eval $(call KernelPackage,usb-serial-visor))
 
 

+define KernelPackage/usb-serial-cypress-m8
+  TITLE:=Support for CypressM8 USB-Serial
+  KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.ko
+  AUTOLOAD:=$(call AutoLoad,65,cypress_m8)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-cypress-m8/description
+ Kernel support for devices with Cypress M8 USB to Serial chip
+ (for example, the Delorme Earthmate LT-20 GPS)
+ Supported microcontrollers in the CY4601 family are:
+       CY7C63741 CY7C63742 CY7C63743 CY7C64013
+endef
+
+$(eval $(call KernelPackage,usb-serial-cypress-m8))
+
+
+define KernelPackage/usb-serial-keyspan
+  TITLE:=Support for Keyspan USB-to-Serial devices
+  KCONFIG:= \
+       CONFIG_USB_SERIAL_KEYSPAN \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28 \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28X \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28XA \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28XB \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19 \
+       CONFIG_USB_SERIAL_KEYSPAN_USA18X \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19W \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19QW \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19QI \
+       CONFIG_USB_SERIAL_KEYSPAN_MPR \
+       CONFIG_USB_SERIAL_KEYSPAN_USA49W \
+       CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.ko
+  AUTOLOAD:=$(call AutoLoad,65,keyspan)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-keyspan/description
+ Kernel support for Keyspan USB-to-Serial devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-keyspan))
+
+
+define KernelPackage/usb-serial-wwan
+  TITLE:=Support for GSM and CDMA modems
+  DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
+  KCONFIG:=CONFIG_USB_SERIAL_WWAN
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
+  AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-wwan/description
+ Kernel support for USB GSM and CDMA modems
+endef
+
+$(eval $(call KernelPackage,usb-serial-wwan))
+
+
+define KernelPackage/usb-serial-option
+  TITLE:=Support for Option HSDPA modems
+  DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0:kmod-usb-serial-wwan
+  KCONFIG:=CONFIG_USB_SERIAL_OPTION
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
+  AUTOLOAD:=$(call AutoLoad,65,option)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-option/description
+ Kernel support for Option HSDPA modems
+endef
+
+$(eval $(call KernelPackage,usb-serial-option))
+
+

 define KernelPackage/usb-storage
 define KernelPackage/usb-storage

-  $(call usbdep,)

   TITLE:=USB Storage support
   TITLE:=USB Storage support

-  DESCRIPTION:=Kernel support for USB Mass Storage devices
-  KCONFIG:=$(CONFIG_USB_STORAGE)
-  FILES:= \
-       $(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
-  DEPENDS:=+kmod-scsi-core
+  DEPENDS:= +!TARGET_x86:kmod-scsi-core
+  KCONFIG:=CONFIG_USB_STORAGE
+  FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.ko
+  AUTOLOAD:=$(call AutoLoad,60,usb-storage,1)
+  $(call AddDepends/usb)

 endef
 endef

-$(eval $(call KernelPackage,usb-storage))

 
 

+define KernelPackage/usb-storage/description
+ Kernel support for USB Mass Storage devices
+endef
+
+$(eval $(call KernelPackage,usb-storage))

 
 
 
 

-define KernelPackage/usb-speedtouch
-  $(call usbdep,@LINUX_2_6 kmod-atm)
-  TITLE:=Support for SpeedTouch ADSL modems
-  DESCRIPTION:=Kernel support for SpeedTouch USB ADSL modems
-  KCONFIG:=$(CONFIG_USB_SPEEDTOUCH)
+define KernelPackage/usb-storage-extras
+  SUBMENU:=$(USB_MENU)
+  TITLE:=Extra drivers for usb-storage
+  DEPENDS:=+kmod-usb-storage
+  KCONFIG:= \
+       CONFIG_USB_STORAGE_ALAUDA \
+       CONFIG_USB_STORAGE_CYPRESS_ATACB \
+       CONFIG_USB_STORAGE_DATAFAB \
+       CONFIG_USB_STORAGE_FREECOM \
+       CONFIG_USB_STORAGE_ISD200 \
+       CONFIG_USB_STORAGE_JUMPSHOT \
+       CONFIG_USB_STORAGE_KARMA \
+       CONFIG_USB_STORAGE_SDDR09 \
+       CONFIG_USB_STORAGE_SDDR55 \
+       CONFIG_USB_STORAGE_USBAT

   FILES:= \
   FILES:= \

-       $(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
+       $(LINUX_DIR)/drivers/usb/storage/ums-alauda.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-cypress.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-datafab.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-freecom.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-isd200.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-jumpshot.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-karma.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-sddr09.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-sddr55.ko \
+       $(LINUX_DIR)/drivers/usb/storage/ums-usbat.ko
+  AUTOLOAD:=$(call AutoLoad,60,ums-alauda ums-cypress ums-datafab \
+                               ums-freecom ums-isd200 ums-jumpshot \
+                               ums-karma ums-sddr09 ums-sddr55 ums-usbat)

 endef
 endef

-$(eval $(call KernelPackage,usb-speedtouch))

 
 

+define KernelPackage/usb-storage-extras/description
+  Say Y here if you want to have some more drivers,
+  such as for SmartMedia card readers.
+endef
+
+$(eval $(call KernelPackage,usb-storage-extras))

 
 

-define KernelPackage/usb-pwc
-  $(call usbdep,+kmod-videodev)
-  TITLE:=Philips WebCam driver
-  DESCRIPTION:=Kernel modules for supporting Philips WebCam USB devices
-  KCONFIG:=$(CONFIG_USB_PWC)
-  AUTOLOAD:=$(call AutoLoad,70,pwc)
+
+define KernelPackage/usb-video
+  TITLE:=Support for USB video devices
+  KCONFIG:=CONFIG_VIDEO_USBVIDEO
+  FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.ko
+  AUTOLOAD:=$(call AutoLoad,61,usbvideo)
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-pwc/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX)
+define KernelPackage/usb-video/description
+ Kernel support for USB video devices

 endef
 
 endef
 

-$(eval $(call KernelPackage,usb-pwc))
+$(eval $(call KernelPackage,usb-video))
+
+
+define KernelPackage/usb-atm
+  TITLE:=Support for ATM on USB bus
+  DEPENDS:=+kmod-atm
+  KCONFIG:=CONFIG_USB_ATM
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.ko
+  AUTOLOAD:=$(call AutoLoad,60,usbatm)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-atm/description
+ Kernel support for USB DSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm))
+
+
+define AddDepends/usb-atm
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=kmod-usb-atm $(1)
+endef
+
+
+define KernelPackage/usb-atm-speedtouch
+  TITLE:=SpeedTouch USB ADSL modems support
+  KCONFIG:=CONFIG_USB_SPEEDTOUCH
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.ko
+  AUTOLOAD:=$(call AutoLoad,70,speedtch)
+  $(call AddDepends/usb-atm)
+endef
+
+define KernelPackage/usb-atm-speedtouch/description
+ Kernel support for SpeedTouch USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-speedtouch))
+
+
+define KernelPackage/usb-atm-ueagle
+  TITLE:=Eagle 8051 based USB ADSL modems support
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.ko
+  KCONFIG:=CONFIG_USB_UEAGLEATM
+  AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
+  $(call AddDepends/usb-atm)
+endef
+
+define KernelPackage/usb-atm-ueagle/description
+ Kernel support for Eagle 8051 based USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-ueagle))
+
+
+define KernelPackage/usb-atm-cxacru
+  TITLE:=cxacru
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.ko
+  KCONFIG:=CONFIG_USB_CXACRU
+  AUTOLOAD:=$(call AutoLoad,70,cxacru)
+  $(call AddDepends/usb-atm)
+endef
+
+define KernelPackage/usb-atm-cxacru/description
+ Kernel support for cxacru based USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-cxacru))
+

 
 define KernelPackage/usb-net
 
 define KernelPackage/usb-net

-  $(call usbdep,)

   TITLE:=Kernel modules for USB-to-Ethernet convertors
   TITLE:=Kernel modules for USB-to-Ethernet convertors

-  DESCRIPTION:=Kernel modules for USB-to-Ethernet convertors
-  KCONFIG:=$(CONFIG_USB_USBNET)
-  DEPENDS:=@USB_SUPPORT
-  AUTOLOAD:=$(call Autoload,60, usbnet)
+  KCONFIG:=CONFIG_USB_USBNET CONFIG_MII=y
+  AUTOLOAD:=$(call AutoLoad,60,usbnet)
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko
+  $(call AddDepends/usb)

 endef
 
 endef
 

-define KernelPackage/usb-net/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX)
+define KernelPackage/usb-net/description
+ Kernel modules for USB-to-Ethernet convertors

 endef
 
 endef
 

-define KernelPackage/usb-net/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX)
+$(eval $(call KernelPackage,usb-net))
+
+
+define AddDepends/usb-net
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=kmod-usb-net $(1)

 endef
 
 endef
 

-$(eval $(call KernelPackage,usb-net))

 
 define KernelPackage/usb-net-asix
 
 define KernelPackage/usb-net-asix

-  $(call usbdep,+kmod-usbnet)

   TITLE:=Kernel module for USB-to-Ethernet Asix convertors
   TITLE:=Kernel module for USB-to-Ethernet Asix convertors

-  DESCRIPTION:=Kernel module for USB-to-Ethernet Asix convertors
-  DEPENDS:=kmod-usb-net
-  KCONFIG:=$(CONFIG_USB_NET_AX8817X)
+  KCONFIG:=CONFIG_USB_NET_AX8817X
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
+  AUTOLOAD:=$(call AutoLoad,61,asix)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-asix/description
+ Kernel module for USB-to-Ethernet Asix convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-asix))
+
+
+define KernelPackage/usb-net-hso
+  TITLE:=Kernel module for Option USB High Speed Mobile Devices
+  KCONFIG:=CONFIG_USB_HSO
+  FILES:= \
+       $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.ko
+  AUTOLOAD:=$(call AutoLoad,61,hso)
+  $(call AddDepends/usb-net)
+  $(call AddDepends/rfkill)

 endef
 
 endef
 

-define KernelPackage/usb-net-asix/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,ax8817x)
+define KernelPackage/usb-net-hso/description
+ Kernel module for Option USB High Speed Mobile Devices

 endef
 
 endef
 

-define KernelPackage/usb-net-asix/2.6
-  FILES:=$(LINUX_DIR)/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,asix)
+$(eval $(call KernelPackage,usb-net-hso))
+
+
+define KernelPackage/usb-net-kaweth
+  TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
+  KCONFIG:=CONFIG_USB_KAWETH
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.ko
+  AUTOLOAD:=$(call AutoLoad,61,kaweth)
+  $(call AddDepends/usb-net)

 endef
 
 endef
 

-$(eval $(call KernelPackage,usb-net-asix))
+define KernelPackage/usb-net-kaweth/description
+ Kernel module for USB-to-Ethernet Kaweth convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-kaweth))
+
+
+define KernelPackage/usb-net-pegasus
+  TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
+  KCONFIG:=CONFIG_USB_PEGASUS
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.ko
+  AUTOLOAD:=$(call AutoLoad,61,pegasus)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-pegasus/description
+ Kernel module for USB-to-Ethernet Pegasus convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-pegasus))
+
+
+define KernelPackage/usb-net-mcs7830
+  TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors
+  KCONFIG:=CONFIG_USB_NET_MCS7830
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.ko
+  AUTOLOAD:=$(call AutoLoad,61,mcs7830)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-mcs7830/description
+ Kernel module for USB-to-Ethernet MCS7830 convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-mcs7830))
+
+
+define KernelPackage/usb-net-dm9601-ether
+  TITLE:=Support for DM9601 ethernet connections
+  KCONFIG:=CONFIG_USB_NET_DM9601
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.ko
+  AUTOLOAD:=$(call AutoLoad,61,dm9601)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-dm9601-ether/description
+  Kernel support for USB DM9601 devices
+endef
+
+$(eval $(call KernelPackage,usb-net-dm9601-ether))
+
+define KernelPackage/usb-net-cdc-ether
+  TITLE:=Support for cdc ethernet connections
+  KCONFIG:=CONFIG_USB_NET_CDCETHER
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.ko
+  AUTOLOAD:=$(call AutoLoad,61,cdc_ether)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-cdc-ether/description
+ Kernel support for USB CDC Ethernet devices
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-ether))
+
+
+define KernelPackage/usb-net-rndis
+  TITLE:=Support for RNDIS connections
+  KCONFIG:=CONFIG_USB_NET_RNDIS_HOST
+  FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.ko
+  AUTOLOAD:=$(call AutoLoad,62,rndis_host)
+  $(call AddDepends/usb-net,+kmod-usb-net-cdc-ether)
+endef
+
+define KernelPackage/usb-net-rndis/description
+ Kernel support for RNDIS connections
+endef
+
+$(eval $(call KernelPackage,usb-net-rndis))
+
+define KernelPackage/usb-net-sierrawireless
+  TITLE:=Support for Sierra Wireless devices
+  KCONFIG:=CONFIG_USB_SIERRA_NET
+  FILES:=$(LINUX_DIR)/drivers/net/usb/sierra_net.ko
+  AUTOLOAD:=$(call AutoLoad,65,sierra_net)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+
+$(eval $(call KernelPackage,usb-net-sierrawireless))
+
+
+define KernelPackage/usb-hid
+  TITLE:=Support for USB Human Input Devices
+  KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID CONFIG_USB_HIDDEV=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
+  AUTOLOAD:=$(call AutoLoad,70,usbhid)
+  $(call AddDepends/usb)
+  $(call AddDepends/hid)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+
+define KernelPackage/usb-hid/description
+ Kernel support for USB HID devices such as keyboards and mice
+endef
+
+$(eval $(call KernelPackage,usb-hid))

 
 
 define KernelPackage/usb-yealink
 
 
 define KernelPackage/usb-yealink

-  $(call usbdep,@LINUX_2_6)

   TITLE:=USB Yealink VOIP phone
   TITLE:=USB Yealink VOIP phone

-  DESCRIPTION:=Kernel support for Yealink VOIP phone
-  KCONFIG:=$(CONFIG_USB_YEALINK)
-  FILES:=$(LINUX_DIR)/drivers/usb/input/yealink.ko
+  KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko

   AUTOLOAD:=$(call AutoLoad,70,yealink)
   AUTOLOAD:=$(call AutoLoad,70,yealink)

-  DEPENDS:=kmod-input-core kmod-input-evdev
+  $(call AddDepends/usb)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/usb-yealink/description
+ Kernel support for Yealink VOIP phone

 endef
 endef

+

 $(eval $(call KernelPackage,usb-yealink))
 
 
 $(eval $(call KernelPackage,usb-yealink))
 
 

+define KernelPackage/usb-cm109
+  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
+  AUTOLOAD:=$(call AutoLoad,70,cm109)
+  $(call AddDepends/usb)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/usb-cm109/description
+ Kernel support for CM109 VOIP phone
+endef
+
+$(eval $(call KernelPackage,usb-cm109))
+
+
+define KernelPackage/usb-test
+  TITLE:=USB Testing Driver
+  DEPENDS:=@DEVEL
+  KCONFIG:=CONFIG_USB_TEST
+  FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-test/description
+ Kernel support for testing USB Host Controller software.
+endef
+
+$(eval $(call KernelPackage,usb-test))
+
+
+define KernelPackage/usb-phidget
+  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
+$(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phidget/description
+ Kernel support for USB Phidget devices.
+endef
+
+$(eval $(call KernelPackage,usb-phidget))
+