The RB513 CF driver is now a module, enable it by default for the RB1xx profile.

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index eb97262..b97d69d 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -6,306 +6,571 @@
 #
 # $Id$
 
 #
 # $Id$
 

-USBMENU:=USB Support
+USB_MENU:=USB Support
+
+ifeq ($(KERNEL),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
 
 define KernelPackage/usb-core

+  SUBMENU:=$(USB_MENU)

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

-  DESCRIPTION:=Kernel support for USB

   DEPENDS:=@USB_SUPPORT
   DEPENDS:=@USB_SUPPORT

-  KCONFIG:=$(CONFIG_USB)
-  SUBMENU:=$(USBMENU)
+  KCONFIG:=CONFIG_USB

   AUTOLOAD:=$(call AutoLoad,20,usbcore)
 endef
 
 define KernelPackage/usb-core/2.4
   AUTOLOAD:=$(call AutoLoad,20,usbcore)
 endef
 
 define KernelPackage/usb-core/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)

 endef
 
 define KernelPackage/usb-core/2.6
 endef
 
 define KernelPackage/usb-core/2.6

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

 endef
 endef

+

 $(eval $(call KernelPackage,usb-core))
 
 
 define KernelPackage/usb-uhci
 $(eval $(call KernelPackage,usb-core))
 
 
 define KernelPackage/usb-uhci

+  $(call usbdep,)

   TITLE:=Support for UHCI controllers
   TITLE:=Support for UHCI controllers

-  DESCRIPTION:=Kernel support for USB UHCI controllers
-  DEPENDS:=kmod-usb-core
-  SUBMENU:=$(USBMENU)
+  KCONFIG:= \
+       CONFIG_USB_UHCI_ALT \
+       CONFIG_USB_UHCI_HCD

 endef
 
 define KernelPackage/usb-uhci/2.4
 endef
 
 define KernelPackage/usb-uhci/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o
-  KCONFIG:=$(CONFIG_USB_UHCI_ALT)
+#  KCONFIG:=CONFIG_USB_UHCI_ALT
+  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o

   AUTOLOAD:=$(call AutoLoad,50,uhci)
 endef
 
 define KernelPackage/usb-uhci/2.6
   AUTOLOAD:=$(call AutoLoad,50,uhci)
 endef
 
 define KernelPackage/usb-uhci/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko
-  KCONFIG:=$(CONFIG_USB_UHCI_HCD)
+#  KCONFIG:=CONFIG_USB_UHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko

   AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
 endef
   AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
 endef

+
+define KernelPackage/usb-uhci/description
+ Kernel support for USB UHCI controllers
+endef
+

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

+

 define KernelPackage/usb-uhci-iv
 define KernelPackage/usb-uhci-iv

+  $(call usbdep,@LINUX_2_4)

   TITLE:=Support for Intel/VIA UHCI controllers 
   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-iv/2.4
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_USB_UHCI)
+  KCONFIG:=CONFIG_USB_UHCI
+  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,50,usb-uhci) 
 endef 
   AUTOLOAD:=$(call AutoLoad,50,usb-uhci) 
 endef 

+
+define KernelPackage/usb-uhci-iv/description
+ Kernel support for Intel/VIA USB UHCI controllers
+endef
+

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

+

 define KernelPackage/usb-ohci
 define KernelPackage/usb-ohci

+  $(call usbdep,)

   TITLE:=Support for OHCI controllers
   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

 endef
 
 define KernelPackage/usb-ohci/2.4
 endef
 
 define KernelPackage/usb-ohci/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o
-  KCONFIG:=$(CONFIG_USB_OHCI)
+#  KCONFIG:=CONFIG_USB_OHCI
+  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o

   AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
 endef
 
 define KernelPackage/usb-ohci/2.6
   AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
 endef
 
 define KernelPackage/usb-ohci/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko
-  KCONFIG:=$(CONFIG_USB_OHCI_HCD)
+#  KCONFIG:=CONFIG_USB_OHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko

   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
 endef
   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
 endef

+
+define KernelPackage/usb-ohci/description
+ Kernel support for USB OHCI controllers
+endef
+

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

+
+define KernelPackage/usb-adm5120
+  $(call usbdep,@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)
+  AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd)
+endef
+
+define KernelPackage/usb-adm5120/description
+ Kernel support for the ADM5120 HCD USB controller
+endef
+
+$(eval $(call KernelPackage,usb-adm5120))
+
+

 define KernelPackage/usb2
 define KernelPackage/usb2

+  $(call usbdep,)

   TITLE:=Support for USB2 controllers
   TITLE:=Support for USB2 controllers

-  DESCRIPTION:=Kernel support for USB2 (EHCI) controllers
-  DEPENDS:=kmod-usb-core
-  KCONFIG:=$(CONFIG_USB)
-  SUBMENU:=$(USBMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_USB_EHCI_HCD)
+  KCONFIG:=CONFIG_USB_EHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
 endef
   AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
 endef

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

 
 

-define usbdep
-  SUBMENU:=$(USBMENU)
-  DEPENDS:=kmod-usb-core $(1)
+define KernelPackage/usb2/description
+ Kernel support for USB2 (EHCI) controllers

 endef
 
 endef
 

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

 
 define KernelPackage/usb-acm
   $(call usbdep,)
   TITLE:=Support for modems/isdn controllers
 
 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)
+  KCONFIG:=CONFIG_USB_ACM

 endef
 
 define KernelPackage/usb-acm/2.4
 endef
 
 define KernelPackage/usb-acm/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/acm.o
+  FILES:=$(LINUX_DIR)/drivers/usb/acm.o

   AUTOLOAD:=$(call AutoLoad,60,acm)
 endef
 
 define KernelPackage/usb-acm/2.6
   AUTOLOAD:=$(call AutoLoad,60,acm)
 endef
 
 define KernelPackage/usb-acm/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko
+  FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko

   AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
 endef
   AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
 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
 $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio

-  $(call usbdep,+kmod-soundcore)
-  TITLE:=Support for audio devices
-  DESCRIPTION:=Kernel support for USB audio devices
+  $(call usbdep,+kmod-sound-core)
+  TITLE:=Support for USB audio devices
+  KCONFIG:= \
+       CONFIG_USB_AUDIO \
+       CONFIG_SND_USB_AUDIO

 endef
 
 define KernelPackage/usb-audio/2.4
 endef
 
 define KernelPackage/usb-audio/2.4

-  KCONFIG:=$(CONFIG_USB_AUDIO)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
+#  KCONFIG:=CONFIG_USB_AUDIO
+  FILES:=$(LINUX_DIR)/drivers/usb/audio.o

   AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.6
   AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.6

-  KCONFIG:=$(CONFIG_SND_USB_AUDIO)
+#  KCONFIG:=CONFIG_SND_USB_AUDIO

   FILES:= \
   FILES:= \

-       $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib.ko \
-       $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio.ko
+       $(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)
 endef
   AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
 endef

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

 $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer
   $(call usbdep,)
   TITLE:=Support for printers
 $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer
   $(call usbdep,)
   TITLE:=Support for printers

-  DESCRIPTION:=Kernel support for USB printers
-  KCONFIG:=$(CONFIG_USB_PRINTER)
+  KCONFIG:=CONFIG_USB_PRINTER

 endef
 
 define KernelPackage/usb-printer/2.4
 endef
 
 define KernelPackage/usb-printer/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/printer.o
+  FILES:=$(LINUX_DIR)/drivers/usb/printer.o

   AUTOLOAD:=$(call AutoLoad,60,printer)
 endef
 
 define KernelPackage/usb-printer/2.6
   AUTOLOAD:=$(call AutoLoad,60,printer)
 endef
 
 define KernelPackage/usb-printer/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko
+  FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko

   AUTOLOAD:=$(call AutoLoad,60,usblp)
 endef
   AUTOLOAD:=$(call AutoLoad,60,usblp)
 endef

+
+define KernelPackage/usb-printer/description
+ Kernel support for USB printers
+endef
+

 $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial
   $(call usbdep,)
   TITLE:=Support for USB-to-Serial converters
 $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial
   $(call usbdep,)
   TITLE:=Support for USB-to-Serial converters

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

   AUTOLOAD:=$(call AutoLoad,60,usbserial)
 endef
   AUTOLOAD:=$(call AutoLoad,60,usbserial)
 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 KernelPackage/usb-serial-airprime
+  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+  TITLE:=Support for Airprime (EVDO) 
+  KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,airprime)
+endef
+
+define KernelPackage/usb-serial-airprime/description
+ Kernel support for Airprime (EVDO) 
+endef
+
+$(eval $(call KernelPackage,usb-serial-airprime))
+
+

 define KernelPackage/usb-serial-belkin
 define KernelPackage/usb-serial-belkin

+  $(call usbdep,kmod-usb-serial)

   TITLE:=Support for Belkin devices
   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:=$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_BELKIN
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)

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

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

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

+  $(call usbdep,kmod-usb-serial)

   TITLE:=Support for FTDI devices
   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:=$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)

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

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

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

+  $(call usbdep,kmod-usb-serial)

   TITLE:=Support for Magic Control Tech. devices
   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:=$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_MCT_U232
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,mct_u232)
 endef
   AUTOLOAD:=$(call AutoLoad,65,mct_u232)
 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-pl2303
 define KernelPackage/usb-serial-pl2303

+  $(call usbdep,kmod-usb-serial)

   TITLE:=Support for Prolific PL2303 devices
   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:=$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_PL2303
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,pl2303)
 endef
   AUTOLOAD:=$(call AutoLoad,65,pl2303)
 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-sierrawireless
+  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+  TITLE:=Support for Sierra Wireless devices
+  KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,sierra)
+endef
+
+define KernelPackage/usb-serial-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-sierrawireless))
+
+

 define KernelPackage/usb-serial-visor
 define KernelPackage/usb-serial-visor

+  $(call usbdep,kmod-usb-serial)

   TITLE:=Support for Handspring Visor devices
   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:=$(MODULES_DIR)/kernel/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_VISOR
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,visor)
 endef
   AUTOLOAD:=$(call AutoLoad,65,visor)
 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-keyspan
+  $(call usbdep,kmod-usb-serial)
+  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.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,keyspan)
+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-option
+  $(call usbdep,kmod-usb-serial @LINUX_2_6)
+  TITLE:=Support for Option HSDPA modems
+  KCONFIG:=CONFIG_USB_SERIAL_OPTION
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,option)
+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,)
+  $(call usbdep,+kmod-scsi-core)

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

-  DESCRIPTION:=Kernel support for USB Mass Storage devices
-  KCONFIG:=$(CONFIG_USB_STORAGE)
-  FILES:= \
-       $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
+  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)
   AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)

-  DEPENDS:=+kmod-scsi-core

 endef
 endef

+
+define KernelPackage/usb-storage/description
+ Kernel support for USB Mass Storage devices
+endef
+

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

+define KernelPackage/usb-video
+  $(call usbdep,@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)
+endef

 
 

-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)
-  FILES:= \
-       $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
+define KernelPackage/usb-video/description
+ Kernel support for USB video devices

 endef
 endef

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

 
 

+$(eval $(call KernelPackage,usb-video))

 
 

-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-atm
+  $(call usbdep,@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)
+  AUTOLOAD:=$(call AutoLoad,60,usbatm)
+endef
+
+define KernelPackage/usb-atm/description
+ Kernel support for USB DSL modems

 endef
 
 endef
 

-define KernelPackage/usb-pwc/2.4
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX)
+$(eval $(call KernelPackage,usb-atm))
+
+
+define KernelPackage/usb-atm-speedtouch
+  $(call usbdep,@LINUX_2_6 kmod-usb-atm)
+  TITLE:=SpeedTouch USB ADSL modems support
+  KCONFIG:=CONFIG_USB_SPEEDTOUCH
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,speedtch)

 endef
 
 endef
 

-$(eval $(call KernelPackage,usb-pwc))
+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
+  $(call usbdep,@LINUX_2_6 kmod-usb-atm)
+  TITLE:=Eagle 8051 based USB ADSL modems support
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_UEAGLEATM
+  AUTOLOAD:=$(call AutoLoad,70,ueagle-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-net
   $(call usbdep,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
 
 define KernelPackage/usb-net
   $(call usbdep,)
   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
+  AUTOLOAD:=$(call Autoload,60,usbnet)

 endef
 
 define KernelPackage/usb-net/2.4
 endef
 
 define KernelPackage/usb-net/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX)

 endef
 
 define KernelPackage/usb-net/2.6
 endef
 
 define KernelPackage/usb-net/2.6

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

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

+

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

-  $(call usbdep,+kmod-usbnet)
+  $(call usbdep,kmod-usb-net @LINUX_2_6)

   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.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,61,asix)

 endef
 
 endef
 

-define KernelPackage/usb-net-asix/2.4
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,ax8817x)
+define KernelPackage/usb-net-asix/description
+ Kernel module for USB-to-Ethernet Asix convertors

 endef
 
 endef
 

-define KernelPackage/usb-net-asix/2.6
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,asix)
+$(eval $(call KernelPackage,usb-net-asix))
+
+
+define KernelPackage/usb-net-kaweth
+  $(call usbdep,kmod-usb-net @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)
+  AUTOLOAD:=$(call Autoload,61,kaweth)

 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
+  $(call usbdep,kmod-usb-net @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)
+  AUTOLOAD:=$(call Autoload,61,pegasus)
+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-cdc-ether
+  $(call usbdep,kmod-usb-net @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)
+  AUTOLOAD:=$(call AutoLoad,61,cdc_ether)
+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-hid
+  $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
+  TITLE:=Support for USB Human Input Devices
+  KCONFIG:=CONFIG_USB_HID
+  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
+  AUTOLOAD:=$(call AutoLoad,70,usbhid)
+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
+  $(call usbdep,@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
+  AUTOLOAD:=$(call AutoLoad,70,yealink)
+endef
+
+define KernelPackage/usb-yealink/description
+ Kernel support for Yealink VOIP phone
+endef
+
+$(eval $(call KernelPackage,usb-yealink))