summaryrefslogtreecommitdiffstats
path: root/package/kernel/modules
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-16 18:14:34 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-16 18:14:34 +0000
commit0361ff582d2bb4fae41242856c3a4df8bcc55ca3 (patch)
treee04cad12e79d59c9f3b01007557fe49be15d8525 /package/kernel/modules
parent80c107f51c33480a2cf0d316fe581dad17a59480 (diff)
pcmcia kmod package fixes for au1000
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8420 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules')
-rw-r--r--package/kernel/modules/other.mk17
1 files changed, 11 insertions, 6 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 4da6e5930..55121a516 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -124,24 +124,29 @@ define KernelPackage/pcmcia-core
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))