aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-16 18:14:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-16 18:14:34 +0000
commit20cd1bc2d6508891e20612791cc680d0fe9f1cc7 (patch)
tree5bee5b5826c189c880926d3c9dade68cf910519e
parent3df35f0b09465cec3a805552ec752ee64f1320e2 (diff)
downloadupstream-20cd1bc2d6508891e20612791cc680d0fe9f1cc7.tar.gz
upstream-20cd1bc2d6508891e20612791cc680d0fe9f1cc7.tar.bz2
upstream-20cd1bc2d6508891e20612791cc680d0fe9f1cc7.zip
pcmcia kmod package fixes for au1000
SVN-Revision: 8420
-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 4da6e5930c..55121a5169 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))