From 4ea6e1c9680c26e4d9d68d1017e3fa97856547b8 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Fri, 26 Mar 2010 10:09:13 +0000 Subject: [PATCH] kernel: move yenta_socket to kmod-pcmcia-core on 2.4, mark kmod-pcmcia-yenta as 2.6 only, move CONFIG_PCCARD_NONSTATIC from kmod-pcmcia-core to kmod-pcmcia-yenta KCONFIG SVN-Revision: 20436 --- package/kernel/modules/other.mk | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 6c7f42c759..8d51f90d25 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -133,7 +133,6 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_PCCARD_NONSTATIC \ PCMCIA_DEBUG=n endef @@ -143,15 +142,15 @@ define KernelPackage/pcmcia-core/2.4 # CONFIG_CARDBUS FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds) + $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket) endef define KernelPackage/pcmcia-core/2.6 # KCONFIG:= \ # CONFIG_PCCARD \ # CONFIG_PCMCIA \ -# CONFIG_PCCARD_NONSTATIC \ # PCMCIA_DEBUG=n FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ @@ -169,20 +168,10 @@ $(eval $(call KernelPackage,pcmcia-core)) define KernelPackage/pcmcia-yenta SUBMENU:=$(OTHER_MENU) TITLE:=yenta socket driver - DEPENDS:=kmod-pcmcia-core + DEPENDS:=@LINUX_2_6 kmod-pcmcia-core KCONFIG:= \ - CONFIG_PCMCIA \ - CONFIG_CARDBUS \ + CONFIG_PCCARD_NONSTATIC \ CONFIG_YENTA -endef - -define KernelPackage/pcmcia-yenta/2.4 - FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,yenta_socket) -endef - -define KernelPackage/pcmcia-yenta/2.6 FILES:= \ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)