Load MUSB before gadget and host drivers are loaded

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

diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk
index 5e5c765..c7cc8f8 100644 (file)
--- a/package/kernel/modules/pcmcia.mk
+++ b/package/kernel/modules/pcmcia.mk
@@ -23,9 +23,9 @@ define KernelPackage/pcmcia-core/2.4
 #      CONFIG_PCMCIA \
 #      CONFIG_CARDBUS
   FILES:= \
 #      CONFIG_PCMCIA \
 #      CONFIG_CARDBUS
   FILES:= \

-       $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
+       $(LINUX_DIR)/drivers/pcmcia/ds.ko \
+       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko

   AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket)
 endef
 
   AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket)
 endef
 


@@ -35,8 +35,8 @@ define KernelPackage/pcmcia-core/2.6
 #      CONFIG_PCMCIA \
 #      PCMCIA_DEBUG=n
   FILES:= \
 #      CONFIG_PCMCIA \
 #      PCMCIA_DEBUG=n
   FILES:= \

-       $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
+       $(LINUX_DIR)/drivers/pcmcia/pcmcia.ko

   AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia)
 endef
 
   AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia)
 endef
 


@@ -50,14 +50,22 @@ $(eval $(call KernelPackage,pcmcia-core))
 define KernelPackage/pcmcia-yenta
   SUBMENU:=$(PCMCIA_MENU)
   TITLE:=yenta socket driver
 define KernelPackage/pcmcia-yenta
   SUBMENU:=$(PCMCIA_MENU)
   TITLE:=yenta socket driver

-  DEPENDS:=@LINUX_2_6 kmod-pcmcia-core
+  DEPENDS:=kmod-pcmcia-core

   KCONFIG:= \
        CONFIG_PCCARD_NONSTATIC \
        CONFIG_YENTA
   KCONFIG:= \
        CONFIG_PCCARD_NONSTATIC \
        CONFIG_YENTA

+# For Linux 2.6.35+
+ifneq ($(wildcard $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko),)
+  FILES:= \
+       $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko \
+       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
+  AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket)
+else

   FILES:= \
   FILES:= \

-       $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko \
+       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko

   AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket)
   AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket)

+endif

 endef
 
 $(eval $(call KernelPackage,pcmcia-yenta))
 endef
 
 $(eval $(call KernelPackage,pcmcia-yenta))


@@ -75,12 +83,12 @@ endef
 
 define KernelPackage/pcmcia-serial/2.4
 #  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
 
 define KernelPackage/pcmcia-serial/2.4
 #  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS

-  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.ko

 endef
 
 define KernelPackage/pcmcia-serial/2.6
 #  KCONFIG:=CONFIG_SERIAL_8250_CS
 endef
 
 define KernelPackage/pcmcia-serial/2.6
 #  KCONFIG:=CONFIG_SERIAL_8250_CS

-  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko

 endef
 
 define KernelPackage/pcmcia-serial/description
 endef
 
 define KernelPackage/pcmcia-serial/description