Add usb-keyspan modules (#2229)

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

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 08b470d..55121a5 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -122,25 +122,31 @@ $(eval $(call KernelPackage,capi))
 define KernelPackage/pcmcia-core
   TITLE:=PCMCIA/CardBus support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
+  DEPENDS:=@PCMCIA_SUPPORT
   SUBMENU:=$(EMENU)
-  KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD
+  KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD CONFIG_PCMCIA_AU1X00
 endef
 
+ifneq ($(CONFIG_LINUX_2_6_AU1000),)
+  PCMCIA_SOCKET_DRIVER:=au1x00_ss
+else
+  PCMCIA_SOCKET_DRIVER:=yenta_socket
+endif
+
 define KernelPackage/pcmcia-core/2.4
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/pcmcia/$(PCMCIA_SOCKET_DRIVER).$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core yenta_socket ds)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core $(PCMCIA_SOCKET_DRIVER) ds)
 endef
 
 define KernelPackage/pcmcia-core/2.6
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-       $(if $(CONFIG_PCMCIA),$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX)) \
-       $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/pcmcia/$(PCMCIA_SOCKET_DRIVER).$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic $(PCMCIA_SOCKET_DRIVER))
 endef
 $(eval $(call KernelPackage,pcmcia-core))
 
@@ -169,7 +175,7 @@ define KernelPackage/bluetooth
   DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
   SUBMENU:=$(EMENU)
-  KCONFIG:=CONFIG_BLUEZ CONFIG_BT
+  KCONFIG:=CONFIG_BLUEZ CONFIG_BT CONFIG_USB_BLUETOOTH
  endef
 
  define KernelPackage/bluetooth/2.4