Patch for extif watchdog support. Thanks b.sander. Closes #2363 #2814 and #3141

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 0953318..db6c403 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -174,8 +174,8 @@ $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio
 
 
 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
   KCONFIG:= \
        CONFIG_USB_AUDIO \
        CONFIG_SND_USB_AUDIO


@@ -403,6 +403,21 @@ 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-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
 define KernelPackage/usb-atm
   $(call usbdep,@LINUX_2_6 +kmod-atm)
   TITLE:=Support for ATM on USB bus


@@ -452,7 +467,7 @@ define KernelPackage/usb-net
   $(call usbdep,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
   KCONFIG:=CONFIG_USB_USBNET
   $(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
 endef
 
 define KernelPackage/usb-net/2.4


@@ -475,7 +490,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)
   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
 endef
 
 define KernelPackage/usb-net-asix/description


@@ -490,7 +505,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)
   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
 endef
 
 define KernelPackage/usb-net-kaweth/description


@@ -505,7 +520,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)
   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
 endef
 
 define KernelPackage/usb-net-pegasus/description


@@ -520,7 +535,7 @@ 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.$(LINUX_KMOD_SUFFIX)
   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)
+  AUTOLOAD:=$(call AutoLoad,61,cdc_ether)

 endef
 
 define KernelPackage/usb-net-cdc-ether/description
 endef
 
 define KernelPackage/usb-net-cdc-ether/description


@@ -559,3 +574,17 @@ define KernelPackage/usb-yealink/description
 endef
 
 $(eval $(call KernelPackage,usb-yealink))
 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))
+