fix pcmcia modules load order (closes: #1355)

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

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index cf66dee..d866089 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -64,6 +64,14 @@ define KernelPackage/ide-pdc202xx
 endef
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+define KernelPackage/ide-aec62xx
+  TITLE:=AEC62xx IDE driver
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_BLK_DEV_AEC62XX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,aec62xx)
+endef
+$(eval $(call KernelPackage,ide-aec62xx))
 
 define KernelPackage/lp
   TITLE:=Parallel port and line printer support
@@ -141,7 +149,7 @@ define KernelPackage/pcmcia-core/2.6
        $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
 endef
 $(eval $(call KernelPackage,pcmcia-core))
 
@@ -168,24 +176,33 @@ $(eval $(call KernelPackage,pcmcia-serial))
 
 define KernelPackage/bluetooth
   TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
   SUBMENU:=$(EMENU)
-  FILES:= \
-       $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.ko \
-       $(MODULES_DIR)/kernel/net/bluetooth/l2cap.ko \
-       $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \
-       $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \
-       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \
-       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko
-  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm hci_uart hci_usb)
-endef
+ endef
 
-define KernelPackage/bluetooth/2.4
+ define KernelPackage/bluetooth/2.4
   KCONFIG:=$(CONFIG_BLUEZ)
+  FILES:= \
+       $(MODULES_DIR)/kernel/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm hci_uart hci_usb)
 endef
 
 define KernelPackage/bluetooth/2.6
   KCONFIG:=$(CONFIG_BT)
+  FILES:= \
+       $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm hci_uart hci_usb)
 endef
 $(eval $(call KernelPackage,bluetooth))
 
@@ -198,12 +215,22 @@ define KernelPackage/softdog
   FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
+
+define KernelPackage/softdog/2.4
+  FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.o
+endef
+
+define KernelPackage/softdog/2.6
+  FILES:=$(MODULES_DIR)/kernel/drivers/char/watchdog/softdog.ko
+endef
+
 $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/videodev
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
+  DEPENDS:=@VIDEO_SUPPORT
   SUBMENU:=$(EMENU)
   KCONFIG:=$(CONFIG_VIDEO_DEV)
   FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)