X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a10614cd42f98639ac1857d3f33ed6924e3c0811..765ad2ceb9b3fbb1d85c1f8cc831eb306b7bf130:/package/kernel/modules/usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 3ab32fd30..60761e3f2 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -30,7 +30,7 @@ endef
 define KernelPackage/usb-core
   SUBMENU:=$(USB_MENU)
   TITLE:=Support for USB
-  DEPENDS:=@USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT +LINUX_2_6_31:kmod-nls-base
   KCONFIG:=CONFIG_USB
   AUTOLOAD:=$(call AutoLoad,20,usbcore)
 endef
@@ -136,7 +136,6 @@ $(eval $(call KernelPackage,usb-adm5120))
 
 define KernelPackage/usb-etrax
   $(call usbdep,@TARGET_etrax)
-  DEPENDS=kmod-usb-core
   TITLE:=Support for the ETRAX USB host controller
   KCONFIG:=CONFIG_ETRAX_USB_HOST \
 	CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y
@@ -150,6 +149,20 @@ endef
 
 $(eval $(call KernelPackage,usb-etrax))
 
+define KernelPackage/usb-octeon
+  $(call usbdep,@TARGET_octeon)
+  TITLE:=Support for the Octeon USB OTG controller
+  KCONFIG:=CONFIG_USB_DWC_OTG
+  FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,dwc_otg)
+endef
+
+define KernelPackage/usb-octeon/description
+  Kernel support for the Octeon USB host controller
+endef
+
+$(eval $(call KernelPackage,usb-octeon))
+
 
 define KernelPackage/usb2
   $(call usbdep,)
@@ -501,7 +514,7 @@ define KernelPackage/usb-video
   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)
+  AUTOLOAD:=$(call AutoLoad,61,usbvideo)
 endef
 
 define KernelPackage/usb-video/description