Changeset 20436

Timestamp:

2010-03-26T11:09:13+01:00 (8 years ago)

Author:

nico

Message:

[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

File:

• trunk/package/kernel/modules/other.mk (modified) (4 diffs)

trunk/package/kernel/modules/other.mk

@@ -134 +134 @@
         CONFIG_CARDBUS \
         CONFIG_PCCARD \
-        CONFIG_PCCARD_NONSTATIC \
         PCMCIA_DEBUG=n
 endef
@@ -144 +143 @@
   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
 
@@ -152 +152 @@
 #       CONFIG_PCCARD \
 #       CONFIG_PCMCIA \
-#       CONFIG_PCCARD_NONSTATIC \
 #       PCMCIA_DEBUG=n
   FILES:= \
@@ -170 +169 @@
   SUBMENU:=$(OTHER_MENU)
   TITLE:=yenta socket driver
-  DEPENDS:=kmod-pcmcia-core
-  KCONFIG:= \
-        CONFIG_PCMCIA \
-        CONFIG_CARDBUS \
+  DEPENDS:=@LINUX_2_6 kmod-pcmcia-core
+  KCONFIG:= \
+        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) \