From b85c7c117a6f26bc490d9a5ec8b6c137dcc59f6d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 27 May 2012 12:33:55 +0000
Subject: kernel: remove a few more obsolete CompareKernelPatchVer calls, add
 dependencies on @TARGET_x86 for a few network drivers that are typically not
 found in non-PC equipment

SVN-Revision: 31870
---
 package/kernel/modules/netsupport.mk | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'package/kernel/modules/netsupport.mk')

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 8776b52..656be4a 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -152,12 +152,7 @@ define KernelPackage/capi
   FILES:= \
 	$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \
 	$(LINUX_DIR)/drivers/isdn/capi/capi.ko
- ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.0)),1)
   AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
- else
-  FILES+= $(LINUX_DIR)/drivers/isdn/capi/capifs.ko
-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
- endif
 endef
 
 define KernelPackage/capi/description
@@ -472,7 +467,7 @@ define KernelPackage/ppp
 	CONFIG_PPP \
 	CONFIG_PPP_ASYNC \
 	CONFIG_SLHC
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+  ifndef CONFIG_LINUX_3_1
     FILES:= \
 	$(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \
 	$(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko \
@@ -498,7 +493,7 @@ define KernelPackage/ppp-synctty
   TITLE:=PPP sync tty support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_SYNC_TTY
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+  ifndef CONFIG_LINUX_3_1
     FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko
   else
     FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko
@@ -518,7 +513,7 @@ define KernelPackage/pppoe
   TITLE:=PPPoE support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPPOE
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+  ifndef CONFIG_LINUX_3_1
     FILES:= \
 	$(LINUX_DIR)/drivers/net/ppp/pppoe.ko \
 	$(LINUX_DIR)/drivers/net/ppp/pppox.ko
@@ -558,7 +553,7 @@ define KernelPackage/pptp
   TITLE:=PPtP support
   DEPENDS:=kmod-ppp +kmod-gre
   KCONFIG:=CONFIG_PPTP
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+  ifndef CONFIG_LINUX_3_1
     FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko
   else
     FILES:=$(LINUX_DIR)/drivers/net/pptp.ko
@@ -608,7 +603,7 @@ define KernelPackage/mppe
   KCONFIG:= \
 	CONFIG_PPP_MPPE_MPPC \
 	CONFIG_PPP_MPPE
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+  ifndef CONFIG_LINUX_3_1
     FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko
   else
     FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko
@@ -858,7 +853,7 @@ define KernelPackage/slip
        CONFIG_SLIP_SMART=y \
        CONFIG_SLIP_MODE_SLIP6=y
 
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+  ifndef CONFIG_LINUX_3_1
     FILES:= \
        $(LINUX_DIR)/drivers/net/slip/slip.ko
   else
-- 
cgit v1.1