summaryrefslogtreecommitdiffstats
path: root/package/kernel/modules
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-26 10:09:13 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-26 10:09:13 +0000
commitb3a24b965252caa99980e1e858b17034654827ea (patch)
tree53118d6b2980a0b2edccdc6e738421573a0294f4 /package/kernel/modules
parentcc608bb07659aa99058bc470b340d766bd42fb14 (diff)
[package] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20436 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules')
-rw-r--r--package/kernel/modules/other.mk21
1 files changed, 5 insertions, 16 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 6c7f42c75..8d51f90d2 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)