update qos-scripts to v1.1 - rewritten hfsc rate calculation

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index b172252..cffd053 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -31,7 +31,6 @@ define KernelPackage/usb-uhci
   TITLE:=Support for UHCI controllers
   DESCRIPTION:=Kernel support for USB UHCI controllers
   DEPENDS:=kmod-usb-core
-  PROVIDES:=usb-controller
   SUBMENU:=$(USBMENU)
 endef
 
@@ -48,12 +47,24 @@ define KernelPackage/usb-uhci/2.6
 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-iv/2.4
+  FILES:=$(MODULES_DIR)/kernel/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
   DESCRIPTION:=Kernel support for USB OHCI controllers
   DEPENDS:=kmod-usb-core
-  PROVIDES:=usb-controller
   SUBMENU:=$(USBMENU)
 endef
 
@@ -70,12 +81,10 @@ define KernelPackage/usb-ohci/2.6
 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
-  PROVIDES:=usb-controller
   KCONFIG:=$(CONFIG_USB)
   SUBMENU:=$(USBMENU)
   FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
@@ -87,7 +96,7 @@ $(eval $(call KernelPackage,usb2))
 
 define usbdep
   SUBMENU:=$(USBMENU)
-  DEPENDS:=kmod-usb-core usb-controller $(1)
+  DEPENDS:=kmod-usb-core $(1)
 endef
 
 
@@ -114,16 +123,20 @@ define KernelPackage/usb-audio
   $(call usbdep,+kmod-soundcore)
   TITLE:=Support for audio devices
   DESCRIPTION:=Kernel support for USB audio devices
-  KCONFIG:=$(CONFIG_USB_AUDIO)
-  AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.4
+  KCONFIG:=$(CONFIG_USB_AUDIO)
   FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
+  AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.6
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/audio.ko
+  KCONFIG:=$(CONFIG_SND_USB_AUDIO)
+  FILES:= \
+       $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib.ko \
+       $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio.ko
+  AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
 endef
 $(eval $(call KernelPackage,usb-audio))
 
@@ -223,10 +236,9 @@ define KernelPackage/usb-storage
   DESCRIPTION:=Kernel support for USB Mass Storage devices
   KCONFIG:=$(CONFIG_USB_STORAGE)
   FILES:= \
-       $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
+  DEPENDS:=+kmod-scsi-core
 endef
 $(eval $(call KernelPackage,usb-storage))
 
@@ -257,11 +269,28 @@ define KernelPackage/usb-pwc/2.4
   FILES:=$(MODULES_DIR)/kernel/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX)
 endef
 
-define KernelPackage/usb-pwc/2.6
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/media/pwc.$(LINUX_KMOD_SUFFIX)
-endef
 $(eval $(call KernelPackage,usb-pwc))
 
-
-
-
+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
+  FILES:= \
+        $(MODULES_DIR)/kernel/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,60, usbnet)
+endef
+$(eval $(call KernelPackage,usb-net))
+
+define KernelPackage/usb-net-asix
+  $(call usbdep,+kmod-usbnet)
+  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)
+  FILES:= \
+        $(MODULES_DIR)/kernel/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call Autoload,61, asix)
+endef
+$(eval $(call KernelPackage,usb-net-asix))