X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8b1c0ef4d59049fd959cd2dbcd8acc094ce575f9..78a4e88e7631e101b3917c58d9de741768598e7a:/package/kernel/modules/usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 1054e4a2d..d391f8b05 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -14,7 +14,7 @@ define KernelPackage/usb-core
   DEPENDS:=@USB_SUPPORT
   KCONFIG:=$(CONFIG_USB)
   SUBMENU:=$(USBMENU)
-  AUTOLOAD:=$(call AutoLoad,20,usb-core)
+  AUTOLOAD:=$(call AutoLoad,20,usbcore)
 endef
 
 define KernelPackage/usb-core/2.4
@@ -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
+  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,17 @@ 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
 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-audio.ko
 endef
 $(eval $(call KernelPackage,usb-audio))
 
@@ -223,10 +233,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))
 
@@ -243,4 +252,22 @@ define KernelPackage/usb-speedtouch
   AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
 endef
 $(eval $(call KernelPackage,usb-speedtouch))
-  
+
+
+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)
+endef
+
+define KernelPackage/usb-pwc/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX)
+endef
+
+$(eval $(call KernelPackage,usb-pwc))
+
+
+
+