X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/67dac5cad683c1e870b7a6c01cb4fbe44942ab6b..502d6255c81bbbfa76c6fc153d2c57351ee85d32:/package/kernel/modules/pcmcia.mk

diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk
index c7cc8f8ab..48112b081 100644
--- a/package/kernel/modules/pcmcia.mk
+++ b/package/kernel/modules/pcmcia.mk
@@ -16,24 +16,6 @@ define KernelPackage/pcmcia-core
 	CONFIG_CARDBUS \
 	CONFIG_PCCARD \
 	PCMCIA_DEBUG=n
-endef
-
-define KernelPackage/pcmcia-core/2.4
-#  KCONFIG:= \
-#	CONFIG_PCMCIA \
-#	CONFIG_CARDBUS
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
-	$(LINUX_DIR)/drivers/pcmcia/ds.ko \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
-  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket)
-endef
-
-define KernelPackage/pcmcia-core/2.6
-#  KCONFIG:= \
-#	CONFIG_PCCARD \
-#	CONFIG_PCMCIA \
-#	PCMCIA_DEBUG=n
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia.ko
@@ -46,28 +28,37 @@ endef
 
 $(eval $(call KernelPackage,pcmcia-core))
 
-
-define KernelPackage/pcmcia-yenta
+define KernelPackage/pcmcia-rsrc
   SUBMENU:=$(PCMCIA_MENU)
-  TITLE:=yenta socket driver
+  TITLE:=PCMCIA resource support
   DEPENDS:=kmod-pcmcia-core
-  KCONFIG:= \
-	CONFIG_PCCARD_NONSTATIC \
-	CONFIG_YENTA
+  KCONFIG:=CONFIG_PCCARD_NONSTATIC=y
 # For Linux 2.6.35+
 ifneq ($(wildcard $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko),)
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
-  AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket)
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko
+  AUTOLOAD:=$(call AutoLoad,26,pcmcia_rsrc)
 else
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
-  AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket)
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko
+  AUTOLOAD:=$(call AutoLoad,26,rsrc_nonstatic)
 endif
 endef
 
+define KernelPackage/pcmcia-rsrc/description
+  Kernel support for PCMCIA resource allocation
+endef
+
+$(eval $(call KernelPackage,pcmcia-rsrc))
+
+
+define KernelPackage/pcmcia-yenta
+  SUBMENU:=$(PCMCIA_MENU)
+  TITLE:=yenta socket driver
+  DEPENDS:=kmod-pcmcia-rsrc
+  KCONFIG:=CONFIG_YENTA
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
+  AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket)
+endef
+
 $(eval $(call KernelPackage,pcmcia-yenta))
 
 
@@ -78,19 +69,14 @@ define KernelPackage/pcmcia-serial
   KCONFIG:= \
 	CONFIG_PCMCIA_SERIAL_CS \
 	CONFIG_SERIAL_8250_CS
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1)
+    FILES:=$(LINUX_DIR)/drivers/tty/serial/serial_cs.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
-define KernelPackage/pcmcia-serial/2.4
-#  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
-  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.ko
-endef
-
-define KernelPackage/pcmcia-serial/2.6
-#  KCONFIG:=CONFIG_SERIAL_8250_CS
-  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko
-endef
-
 define KernelPackage/pcmcia-serial/description
  Kernel support for PCMCIA/CardBus serial devices
 endef