[package] fix USB modules build on octeon

[openwrt/svn-archive/archive.git] / package / kernel / modules / usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index c9cd11b7da185d0c67cc85f59783e980b1a5a9c1..ac661285ef69299f564c6c2088a5001300905f57 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -57,7 +57,7 @@ define KernelPackage/usb-eth-gadget
        CONFIG_USB_ETH_EEM=y
   DEPENDS:=+kmod-usb-gadget
   FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
-  AUTOLOAD:=$(call AutoLoad,52,usb-eth-gadget)
+  AUTOLOAD:=$(call AutoLoad,52,g_ether)
   $(call AddDepends/usb)
 endef
 
@@ -90,7 +90,8 @@ define KernelPackage/usb-ohci
   KCONFIG:= \
        CONFIG_USB_OHCI \
        CONFIG_USB_OHCI_HCD \
-       CONFIG_USB_OHCI_AR71XX=y
+       CONFIG_USB_OHCI_AR71XX=y \
+       CONFIG_USB_OCTEON_OHCI=y
   FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)
   $(call AddDepends/usb)
@@ -112,7 +113,7 @@ define KernelPackage/musb-hdrc
        CONFIG_USB_MUSB_DEBUG=y
   DEPENDS:=@TARGET_omap24xx
   FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko
-  AUTOLOAD:=$(call AutoLoad,55,musb_hdrc)
+  AUTOLOAD:=$(call AutoLoad,46,musb_hdrc)
   $(call AddDepends/usb)
 endef
 
@@ -129,7 +130,7 @@ define KernelPackage/nop-usb-xceiv
        CONFIG_NOP_USB_XCEIV
   DEPENDS:=@TARGET_omap24xx
   FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko
-  AUTOLOAD:=$(call AutoLoad,53,nop-usb-xceiv)
+  AUTOLOAD:=$(call AutoLoad,45,nop-usb-xceiv)
   $(call AddDepends/usb)
 endef
 
@@ -162,9 +163,9 @@ define KernelPackage/usb-tahvo
        CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT=n \
        CONFIG_USB_OHCI_HCD_OMAP1=y \
        CONFIG_USB_GADGET_DEBUG_FS=n
-  DEPENDS:=@TARGET_omap24xx +kmod-usb-ohci +kmod-tusb6010 +kmod-usb-gadget
+  DEPENDS:=@TARGET_omap24xx +kmod-tusb6010 +kmod-usb-gadget
   FILES:=$(LINUX_DIR)/drivers/cbus/tahvo-usb.ko
-  AUTOLOAD:=$(call AutoLoad,54,tahvo-usb)
+  AUTOLOAD:=$(call AutoLoad,45,tahvo-usb)
   $(call AddDepends/usb)
 endef
 
@@ -198,6 +199,7 @@ define KernelPackage/usb2
   TITLE:=Support for USB2 controllers
   KCONFIG:=CONFIG_USB_EHCI_HCD \
     CONFIG_USB_EHCI_AR71XX=y \
+    CONFIG_USB_OCTEON_EHCI=y \
     CONFIG_USB_EHCI_FSL=n
   FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1)
@@ -544,7 +546,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan))
 
 define KernelPackage/usb-serial-wwan
   TITLE:=Support for GSM and CDMA modems
-  DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37
+  DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38
   KCONFIG:=CONFIG_USB_SERIAL_WWAN
   FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
   AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
@@ -560,7 +562,7 @@ $(eval $(call KernelPackage,usb-serial-wwan))
 
 define KernelPackage/usb-serial-option
   TITLE:=Support for Option HSDPA modems
-  DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-usb-serial-wwan
+  DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-usb-serial-wwan
   KCONFIG:=CONFIG_USB_SERIAL_OPTION
   FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
   AUTOLOAD:=$(call AutoLoad,65,option)