kernel: remove kernel module checks/dependencies for 3.14

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45377
author: Felix Fietkau <nbd@openwrt.org> 2015-04-11 10:43:46 +0000
committer: Felix Fietkau <nbd@openwrt.org> 2015-04-11 10:43:46 +0000
commit: e8126cbfbd794cd25b12ede86ebc4108f304e979 (patch)
tree: c0289eba079966535ca67821115abaaf4cfddbdb
parent: f4af7fe1343f92e0342761c23eb5fe5f0dd63bc9 (diff)
download: upstream-e8126cbfbd794cd25b12ede86ebc4108f304e979.tar.gz
upstream-e8126cbfbd794cd25b12ede86ebc4108f304e979.tar.bz2
upstream-e8126cbfbd794cd25b12ede86ebc4108f304e979.zip
9 files changed, 26 insertions, 44 deletions
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 94d4cf2a53..ca529ff424 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -319,12 +319,12 @@ define KernelPackage/fs-nfs-common
   KCONFIG:= \
 	CONFIG_LOCKD \
 	CONFIG_SUNRPC \
-	CONFIG_GRACE_PERIOD@ge3.18
+	CONFIG_GRACE_PERIOD
   FILES:= \
 	$(LINUX_DIR)/fs/lockd/lockd.ko \
 	$(LINUX_DIR)/net/sunrpc/sunrpc.ko \
-	$(LINUX_DIR)/fs/nfs_common/grace.ko@ge3.18
-  AUTOLOAD:=$(call AutoLoad,30,grace@ge3.18 sunrpc lockd)
+	$(LINUX_DIR)/fs/nfs_common/grace.ko
+  AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
 endef
 
 $(eval $(call KernelPackage,fs-nfs-common))
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 971e653855..61e71eadd7 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -290,7 +290,6 @@ define KernelPackage/hwmon-pwmfan
   FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko
   AUTOLOAD:=$(call AutoLoad,60,pwm-fan)
   $(call AddDepends/hwmon,)
-  DEPENDS+=@!LINUX_3_14
 endef
 
 define KernelPackage/hwmon-pwmfan/description
diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index 10fd758adc..9d35e42e24 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -119,7 +119,6 @@ $(eval $(call KernelPackage,lib-lzo))
 
 define KernelPackage/lib-lz4
   SUBMENU:=$(LIB_MENU)
-  DEPENDS:=@!LINUX_3_14
   TITLE:=LZ4 support
   KCONFIG:= \
 	CONFIG_LZ4_COMPRESS \
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 9332268065..9dd18f311f 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -115,8 +115,7 @@ define KernelPackage/et131x
   TITLE:=Agere ET131x Gigabit Ethernet driver
   URL:=http://sourceforge.net/projects/et131x
   FILES:= \
-	$(LINUX_DIR)/drivers/staging/et131x/et131x.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/net/ethernet/agere/et131x.ko@ge3.18
+	$(LINUX_DIR)/drivers/net/ethernet/agere/et131x.ko
   KCONFIG:= \
 	CONFIG_ET131X \
 	CONFIG_ET131X_DEBUG=n
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index f64808c1be..01bf189618 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -229,11 +229,11 @@ IPSET_MODULES:= \
 	ipset/ip_set_bitmap_ipmac \
 	ipset/ip_set_bitmap_port \
 	ipset/ip_set_hash_ip \
-	ipset/ip_set_hash_ipmark@ge3.18 \
+	ipset/ip_set_hash_ipmark \
 	ipset/ip_set_hash_ipport \
 	ipset/ip_set_hash_ipportip \
 	ipset/ip_set_hash_ipportnet \
-	ipset/ip_set_hash_mac@ge3.18 \
+	ipset/ip_set_hash_mac \
 	ipset/ip_set_hash_netportnet \
 	ipset/ip_set_hash_net \
 	ipset/ip_set_hash_netnet \
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 60e3094c20..547e429f09 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -148,7 +148,6 @@ $(eval $(call KernelPackage,8021q))
 define KernelPackage/udptunnel4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv4 UDP tunneling support
-  DEPENDS:=@!LINUX_3_14
   KCONFIG:=CONFIG_NET_UDP_TUNNEL
   FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko
   AUTOLOAD:=$(call AutoLoad,32,udp_tunnel)
@@ -160,7 +159,6 @@ $(eval $(call KernelPackage,udptunnel4))
 define KernelPackage/udptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 UDP tunneling support
-  DEPENDS:=@!LINUX_3_14
   KCONFIG:=CONFIG_NET_UDP_TUNNEL
   FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko
   AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel)
@@ -174,8 +172,8 @@ define KernelPackage/vxlan
   TITLE:=Native VXLAN Kernel support
   DEPENDS:= \
 	+kmod-iptunnel \
-	+!LINUX_3_14:kmod-udptunnel4 \
-	+(!LINUX_3_14&&IPV6):kmod-udptunnel6
+	+kmod-udptunnel4 \
+	+IPV6:kmod-udptunnel6
   KCONFIG:=CONFIG_VXLAN
   FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
   AUTOLOAD:=$(call AutoLoad,13,vxlan)
@@ -863,8 +861,8 @@ define KernelPackage/l2tp
   TITLE:=Layer Two Tunneling Protocol (L2TP)
   DEPENDS:= \
 	+IPV6:kmod-ipv6 \
-	+!LINUX_3_14:kmod-udptunnel4 \
-	+(!LINUX_3_14&&IPV6):kmod-udptunnel6
+	+kmod-udptunnel4 \
+	+IPV6:kmod-udptunnel6
   KCONFIG:=CONFIG_L2TP \
 	CONFIG_L2TP_V3=y \
 	CONFIG_L2TP_DEBUGFS=n
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 4696f2daec..bfdda2c389 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -70,7 +70,7 @@ $(eval $(call KernelPackage,bluetooth))
 define KernelPackage/bluetooth_6lowpan
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth 6LoWPAN support
-  DEPENDS:=+kmod-bluetooth @!LINUX_3_14
+  DEPENDS:=+kmod-bluetooth
   KCONFIG:= \
   CONFIG_6LOWPAN=m \
   CONFIG_BT_6LOWPAN=m
@@ -739,7 +739,7 @@ $(eval $(call KernelPackage,ikconfig))
 define KernelPackage/zram
   SUBMENU:=$(OTHER_MENU)
   TITLE:=ZRAM
-  DEPENDS:=+kmod-lib-lzo +!LINUX_3_14:kmod-lib-lz4
+  DEPENDS:=+kmod-lib-lzo +kmod-lib-lz4
   KCONFIG:= \
 	CONFIG_ZSMALLOC \
 	CONFIG_ZRAM \
@@ -966,8 +966,7 @@ define KernelPackage/echo
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Line Echo Canceller
   KCONFIG:=CONFIG_ECHO
-  FILES:=$(LINUX_DIR)/drivers/staging/echo/echo.ko@lt3.18 \
-	  $(LINUX_DIR)/drivers/misc/echo/echo.ko@ge3.18
+  FILES:=$(LINUX_DIR)/drivers/misc/echo/echo.ko
   AUTOLOAD:=$(call AutoLoad,50,echo)
 endef
 
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 7d160b0166..4078e1b448 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -218,8 +218,7 @@ define KernelPackage/usb-gadget
   TITLE:=USB Gadget support
   KCONFIG:=CONFIG_USB_GADGET
   FILES:=\
-	$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko@ge3.18
+	$(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko
   AUTOLOAD:=$(call AutoLoad,45,udc-core)
   DEPENDS:=@USB_GADGET_SUPPORT
   $(call AddDepends/usb)
@@ -255,16 +254,11 @@ define KernelPackage/usb-eth-gadget
 	CONFIG_USB_ETH_EEM=n
   DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
   FILES:= \
-	$(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko@lt3.18
+	$(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko
   AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
   $(call AddDepends/usb)
 endef
@@ -281,16 +275,11 @@ define KernelPackage/usb-serial-gadget
   KCONFIG:=CONFIG_USB_G_SERIAL
   DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
   FILES:= \
-	$(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko@ge3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko@lt3.18
+	$(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko
   AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial)
   $(call AddDepends/usb)
 endef
@@ -1072,7 +1061,7 @@ define KernelPackage/usb-net
   TITLE:=Kernel modules for USB-to-Ethernet convertors
   DEPENDS:=+kmod-mii
   KCONFIG:=CONFIG_USB_USBNET \
-	CONFIG_USB_NET_DRIVERS@ge3.18
+	CONFIG_USB_NET_DRIVERS
   AUTOLOAD:=$(call AutoProbe,usbnet)
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko
   $(call AddDepends/usb)
diff --git a/target/linux/brcm63xx/modules.mk b/target/linux/brcm63xx/modules.mk
index 635a992864..6f6aa3875a 100644
--- a/target/linux/brcm63xx/modules.mk
+++ b/target/linux/brcm63xx/modules.mk
@@ -26,8 +26,7 @@ define KernelPackage/bcm63xx-udc
   DEPENDS:=@TARGET_brcm63xx +kmod-usb-gadget
   KCONFIG:=CONFIG_USB_BCM63XX_UDC
   FILES:= \
-	$(LINUX_DIR)/drivers/usb/gadget/bcm63xx_udc.ko@lt3.18 \
-	$(LINUX_DIR)/drivers/usb/gadget/udc/bcm63xx_udc.ko@ge3.18
+	$(LINUX_DIR)/drivers/usb/gadget/udc/bcm63xx_udc.ko
   AUTOLOAD:=$(call AutoLoad,51,bcm63xx_udc)
   $(call AddDepends/usb)
 endef
author	Felix Fietkau <nbd@openwrt.org>	2015-04-11 10:43:46 +0000
committer	Felix Fietkau <nbd@openwrt.org>	2015-04-11 10:43:46 +0000
commit	e8126cbfbd794cd25b12ede86ebc4108f304e979 (patch)
tree	c0289eba079966535ca67821115abaaf4cfddbdb
parent	f4af7fe1343f92e0342761c23eb5fe5f0dd63bc9 (diff)
download	upstream-e8126cbfbd794cd25b12ede86ebc4108f304e979.tar.gz upstream-e8126cbfbd794cd25b12ede86ebc4108f304e979.tar.bz2 upstream-e8126cbfbd794cd25b12ede86ebc4108f304e979.zip