fix build of pcmcia package on x86-2.6

SVN-Revision: 7147

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index bd598fc3bd51be444e65edc12eb6624407735276..a30046daf5d4572eee228dee9485acd804537896 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -154,10 +154,10 @@ define KernelPackage/pcmcia-core
   TITLE:=PCMCIA/CardBus support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_PCMCIA)
 endef
 
 define KernelPackage/pcmcia-core/2.4
+  KCONFIG:=$(CONFIG_PCMCIA)
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
@@ -166,9 +166,9 @@ define KernelPackage/pcmcia-core/2.4
 endef
 
 define KernelPackage/pcmcia-core/2.6
+  KCONFIG:=$(CONFIG_PCCARD)
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)