From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 9 May 2007 15:33:31 +0000 (+0000)
Subject: fix build of pcmcia package on x86-2.6
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=402ec54af8095c4a63f77bca0f311efdfaecd6f2;p=15.05%2Fopenwrt.git

fix build of pcmcia package on x86-2.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7147 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index bd598fc3bd..a30046daf5 100644
--- 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)