The following patch enables txpower setting for hostap driver and restores txpower...

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 21f018b..f3035f4 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -6,7 +6,7 @@
 #
 # $Id$
 
-USBMENU:=USB Support
+USB_MENU:=USB Support
 
 ifeq ($(KERNEL),2.4)
   USBNET_DIR:=usb/net
@@ -23,13 +23,13 @@ USBHID_DIR?=hid/usbhid
 USBINPUT_DIR?=input/misc
 
 define usbdep
-  SUBMENU:=$(USBMENU)
+  SUBMENU:=$(USB_MENU)
   DEPENDS:=kmod-usb-core $(1)
 endef
 
 
 define KernelPackage/usb-core
-  SUBMENU:=$(USBMENU)
+  SUBMENU:=$(USB_MENU)
   TITLE:=Support for USB
   DEPENDS:=@USB_SUPPORT
   KCONFIG:=CONFIG_USB
@@ -174,8 +174,8 @@ $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio
-  $(call usbdep,+kmod-soundcore)
-  TITLE:=Support for audio devices
+  $(call usbdep,+kmod-sound-core)
+  TITLE:=Support for USB audio devices
   KCONFIG:= \
        CONFIG_USB_AUDIO \
        CONFIG_SND_USB_AUDIO
@@ -315,6 +315,21 @@ endef
 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
+define KernelPackage/usb-serial-cp2101
+  $(call usbdep,kmod-usb-serial)
+  TITLE:=Support for Silicon Labs cp2101 devices
+  KCONFIG:=CONFIG_USB_SERIAL_CP2101
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp2101.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,cp2101)
+endef
+
+define KernelPackage/usb-serial-cp2101/description
+ Kernel support for Silicon Labs cp2101 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-cp2101))
+
+
 define KernelPackage/usb-serial-sierrawireless
   $(call usbdep,kmod-usb-serial @LINUX_2_6)
   TITLE:=Support for Sierra Wireless devices
@@ -403,6 +418,21 @@ endef
 $(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-video/description
+ Kernel support for USB video devices
+endef
+
+$(eval $(call KernelPackage,usb-video))
+
+
 define KernelPackage/usb-atm
   $(call usbdep,@LINUX_2_6 +kmod-atm)
   TITLE:=Support for ATM on USB bus
@@ -418,41 +448,41 @@ endef
 $(eval $(call KernelPackage,usb-atm))
 
 
-define KernelPackage/usb-speedtouch
-  $(call usbdep,@LINUX_2_6 +kmod-atm)
-  TITLE:=Support for SpeedTouch ADSL modems
+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
 
-define KernelPackage/usb-speedtouch/description
+define KernelPackage/usb-atm-speedtouch/description
  Kernel support for SpeedTouch USB ADSL modems
 endef
 
-$(eval $(call KernelPackage,usb-speedtouch))
+$(eval $(call KernelPackage,usb-atm-speedtouch))
 
 
-define KernelPackage/ueagle-atm
-  $(call usbdep,@LINUX_2_6 +kmod-atm)
-  TITLE:=Driver for Eagle 8051 based USB ADSL modems
+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/ueagle-atm/description
+define KernelPackage/usb-atm-ueagle/description
  Kernel support for Eagle 8051 based USB ADSL modems
 endef
 
-$(eval $(call KernelPackage,ueagle-atm))
+$(eval $(call KernelPackage,usb-atm-ueagle))
 
 
 define KernelPackage/usb-net
   $(call usbdep,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
   KCONFIG:=CONFIG_USB_USBNET
-  AUTOLOAD:=$(call Autoload,60, usbnet)
+  AUTOLOAD:=$(call AutoLoad,60,usbnet)
 endef
 
 define KernelPackage/usb-net/2.4
@@ -475,7 +505,7 @@ define KernelPackage/usb-net-asix
   TITLE:=Kernel module for USB-to-Ethernet Asix convertors
   KCONFIG:=CONFIG_USB_NET_AX8817X
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,asix)
+  AUTOLOAD:=$(call AutoLoad,61,asix)
 endef
 
 define KernelPackage/usb-net-asix/description
@@ -490,7 +520,7 @@ 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.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,kaweth)
+  AUTOLOAD:=$(call AutoLoad,61,kaweth)
 endef
 
 define KernelPackage/usb-net-kaweth/description
@@ -505,7 +535,7 @@ 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.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call Autoload,61,pegasus)
+  AUTOLOAD:=$(call AutoLoad,61,pegasus)
 endef
 
 define KernelPackage/usb-net-pegasus/description
@@ -515,6 +545,21 @@ 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
@@ -544,3 +589,17 @@ define KernelPackage/usb-yealink/description
 endef
 
 $(eval $(call KernelPackage,usb-yealink))
+
+define KernelPackage/usb-test
+  $(call usbdep,@LINUX_2_6 @DEVEL)
+  TITLE:=USB Testing Driver
+  KCONFIG:=CONFIG_USB_TEST
+  FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko
+endef
+
+define KernelPackage/usb-test/description
+ Kernel support for testing USB Host Controller software.
+endef
+
+$(eval $(call KernelPackage,usb-test))
+