kernel: include the xfrm_algo module on 3.6+ (fixes #12552)

[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 e4df2aa395915b73a1f839c4051ccc5999a19127..cac727719c380a47cd68000ebe938dafa48aac78 100644 (file)
--- a/package/kernel/modules/pcmcia.mk
+++ b/package/kernel/modules/pcmcia.mk
@@ -38,7 +38,7 @@ ifneq ($(wildcard $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko),)
   FILES:=$(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko
   AUTOLOAD:=$(call AutoLoad,26,pcmcia_rsrc)
 else
-  FILES:=$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko \
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko
   AUTOLOAD:=$(call AutoLoad,26,rsrc_nonstatic)
 endif
 endef
@@ -69,11 +69,7 @@ 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
+    FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/serial_cs.ko
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef