From 3f0f8d9c87cc53042f444a0c00c87df630092d31 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 21 Jun 2011 20:52:53 +0000 Subject: [PATCH] fix and make usable kmod-pcmcia-rsrc This module is also needed for e.g: kmod-bcm63xx-pcmcia SVN-Revision: 27253 --- package/kernel/modules/pcmcia.mk | 39 ++++++++++++++++++++------------ target/linux/brcm63xx/modules.mk | 2 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index 468a62f0a0..e4df2aa395 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -28,26 +28,35 @@ endef $(eval $(call KernelPackage,pcmcia-core)) +define KernelPackage/pcmcia-rsrc + SUBMENU:=$(PCMCIA_MENU) + TITLE:=PCMCIA resource support + DEPENDS:=kmod-pcmcia-core + KCONFIG:=CONFIG_PCCARD_NONSTATIC=y +# For Linux 2.6.35+ +ifneq ($(wildcard $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko),) + FILES:=$(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko + AUTOLOAD:=$(call AutoLoad,26,pcmcia_rsrc) +else + FILES:=$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko \ + AUTOLOAD:=$(call AutoLoad,26,rsrc_nonstatic) +endif +endef + +define KernelPackage/pcmcia-rsrc/description + Kernel support for PCMCIA resource allocation +endef + +$(eval $(call KernelPackage,pcmcia-rsrc)) + define KernelPackage/pcmcia-yenta SUBMENU:=$(PCMCIA_MENU) TITLE:=yenta socket driver - DEPENDS:=kmod-pcmcia-core - 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 + DEPENDS:=kmod-pcmcia-rsrc + KCONFIG:=CONFIG_YENTA + FILES:=$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket) -else - FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko \ - $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko - AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket) -endif endef $(eval $(call KernelPackage,pcmcia-yenta)) diff --git a/target/linux/brcm63xx/modules.mk b/target/linux/brcm63xx/modules.mk index 845fb644a7..e48d298bf0 100644 --- a/target/linux/brcm63xx/modules.mk +++ b/target/linux/brcm63xx/modules.mk @@ -24,7 +24,7 @@ $(eval $(call KernelPackage,bcm63xx-spi)) define KernelPackage/pcmcia-bcm63xx SUBMENU:=$(PCMCIA_MENU) TITLE:=Broadcom BCM63xx PCMCIA support - DEPENDS:=@TARGET_brcm63xx kmod-pcmcia-core + DEPENDS:=@TARGET_brcm63xx +kmod-pcmcia-rsrc KCONFIG:=CONFIG_PCMCIA_BCM63XX FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.ko AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia)