kernel: fix some problems with kernel 2.6.38

[openwrt/svn-archive/archive.git] / package / kernel / modules / pcmcia.mk

diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk
index c7cc8f8abc38599947ac8c65ae0f385b3d31a465..8b23934d3171dffd09856bc17328b86fd755da15 100644 (file)
--- a/package/kernel/modules/pcmcia.mk
+++ b/package/kernel/modules/pcmcia.mk
@@ -78,19 +78,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