summaryrefslogtreecommitdiff
path: root/package/kernel/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-19 11:59:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-19 11:59:17 +0000
commitb3fdc3cfea0c51ce9344c15ace9933f682e27363 (patch)
treec52d2384a2598628048ef04a4dfc381535f78e9e /package/kernel/linux
parent0db8c86666147e70b5ff2e9be23423879e52b3ad (diff)
downloadmtk-20170518-b3fdc3cfea0c51ce9344c15ace9933f682e27363.zip
mtk-20170518-b3fdc3cfea0c51ce9344c15ace9933f682e27363.tar.gz
mtk-20170518-b3fdc3cfea0c51ce9344c15ace9933f682e27363.tar.bz2
kernel: remove obsolete kernel version dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44892
Diffstat (limited to 'package/kernel/linux')
-rw-r--r--package/kernel/linux/modules/fs.mk2
-rw-r--r--package/kernel/linux/modules/hwmon.mk8
-rw-r--r--package/kernel/linux/modules/leds.mk2
-rw-r--r--package/kernel/linux/modules/lib.mk2
-rw-r--r--package/kernel/linux/modules/netdevices.mk2
-rw-r--r--package/kernel/linux/modules/netfilter.mk1
-rw-r--r--package/kernel/linux/modules/netsupport.mk12
-rw-r--r--package/kernel/linux/modules/other.mk10
-rw-r--r--package/kernel/linux/modules/usb.mk13
-rw-r--r--package/kernel/linux/modules/wireless.mk2
10 files changed, 21 insertions, 33 deletions
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 69fce51..dd44eb9 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -62,7 +62,7 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
- DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +!LINUX_3_8:kmod-lib-raid6 +!LINUX_3_8:kmod-lib-xor
+ DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +kmod-lib-raid6 +kmod-lib-xor
KCONFIG:=\
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index c6ef9ea..5f45f92 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -46,7 +46,6 @@ $(eval $(call KernelPackage,hwmon-vid))
define KernelPackage/hwmon-adt7410
TITLE:=ADT7410 monitoring support
-ifeq ($(CONFIG_LINUX_3_8),)
KCONFIG:= \
CONFIG_SENSORS_ADT7X10 \
CONFIG_SENSORS_ADT7410
@@ -54,11 +53,6 @@ ifeq ($(CONFIG_LINUX_3_8),)
$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
$(LINUX_DIR)/drivers/hwmon/adt7410.ko
AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
-else
- KCONFIG:=CONFIG_SENSORS_ADT7410
- FILES:=$(LINUX_DIR)/drivers/hwmon/adt7410.ko
- AUTOLOAD:=$(call AutoLoad,60,adt7410)
-endif
$(call AddDepends/hwmon,+kmod-i2c-core)
endef
@@ -296,7 +290,7 @@ define KernelPackage/hwmon-pwmfan
FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko
AUTOLOAD:=$(call AutoLoad,60,pwm-fan)
$(call AddDepends/hwmon,)
- DEPENDS+=@!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_14
+ DEPENDS+=@!LINUX_3_10 @!LINUX_3_14
endef
define KernelPackage/hwmon-pwmfan/description
diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk
index 3e345e8..996deb3 100644
--- a/package/kernel/linux/modules/leds.mk
+++ b/package/kernel/linux/modules/leds.mk
@@ -22,7 +22,7 @@ endef
$(eval $(call KernelPackage,leds-gpio))
-LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds$(if $(CONFIG_LINUX_3_8),,/trigger)
+LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds/trigger
define KernelPackage/ledtrig-heartbeat
SUBMENU:=$(LEDS_MENU)
diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index f230a99..7c17a0a 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -119,7 +119,7 @@ $(eval $(call KernelPackage,lib-lzo))
define KernelPackage/lib-lz4
SUBMENU:=$(LIB_MENU)
- DEPENDS:=@!(LINUX_3_3||LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
+ DEPENDS:=@!LINUX_3_10 @!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 b5dc92f..dd8692a 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -484,7 +484,7 @@ $(eval $(call KernelPackage,igb))
define KernelPackage/b44
TITLE:=Broadcom 44xx driver
KCONFIG:=CONFIG_B44
- DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +(!LINUX_3_10&&!LINUX_3_13):kmod-libphy
+ DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +!LINUX_3_10:kmod-libphy
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
AUTOLOAD:=$(call AutoLoad,19,b44,1)
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 8dfb1a3..e0193c7 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -373,7 +373,6 @@ $(eval $(call KernelPackage,nf-nathelper-extra))
define KernelPackage/ipt-queue
TITLE:=Module for user-space packet queueing
KCONFIG:=$(KCONFIG_IPT_QUEUE)
- DEPENDS:=@!LINUX_3_6
FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_QUEUE-m)))
$(call AddDepends/ipt)
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index c1bd786..9de1ce2 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -148,7 +148,7 @@ $(eval $(call KernelPackage,8021q))
define KernelPackage/udptunnel4
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPv4 UDP tunneling support
- DEPENDS:=@(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14)
+ DEPENDS:=@!LINUX_3_10 @!LINUX_3_14
KCONFIG:=CONFIG_NET_UDP_TUNNEL
FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko
AUTOLOAD:=$(call AutoLoad,32,udp_tunnel)
@@ -160,7 +160,7 @@ $(eval $(call KernelPackage,udptunnel4))
define KernelPackage/udptunnel6
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPv6 UDP tunneling support
- DEPENDS:=@(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14) +kmod-ipv6
+ DEPENDS:=@!LINUX_3_10 @!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 +174,8 @@ define KernelPackage/vxlan
TITLE:=Native VXLAN Kernel support
DEPENDS:= \
+kmod-iptunnel \
- +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14):kmod-udptunnel4 \
- +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14&&IPV6):kmod-udptunnel6
+ +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \
+ +(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6
KCONFIG:=CONFIG_VXLAN
FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
AUTOLOAD:=$(call AutoLoad,13,vxlan)
@@ -890,8 +890,8 @@ define KernelPackage/l2tp
TITLE:=Layer Two Tunneling Protocol (L2TP)
DEPENDS:= \
+IPV6:kmod-ipv6 \
- +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14):kmod-udptunnel4 \
- +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14&&IPV6):kmod-udptunnel6
+ +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \
+ +(!LINUX_3_10&&!LINUX_3_14&&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 57f682d..c39c1ab 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -13,7 +13,7 @@ WATCHDOG_DIR:=watchdog
define KernelPackage/6lowpan-iphc
USBMENU:=$(OTHER_MENU)
TITLE:=6lowpan shared code
- DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_13
+ DEPENDS:=@!LINUX_3_10
KCONFIG:=CONFIG_6LOWPAN_IPHC
HIDDEN:=1
FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,6lowpan-iphc))
define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +!LINUX_3_10:kmod-6lowpan-iphc
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
@@ -73,7 +73,7 @@ $(eval $(call KernelPackage,bluetooth))
define KernelPackage/bluetooth_6lowpan
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth 6LoWPAN support
- DEPENDS:=+kmod-bluetooth @!(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
+ DEPENDS:=+kmod-bluetooth @!LINUX_3_10 @!LINUX_3_14
KCONFIG:= \
CONFIG_6LOWPAN=m \
CONFIG_BT_6LOWPAN=m
@@ -696,7 +696,7 @@ define KernelPackage/serial-8250
CONFIG_SERIAL_8250_SHARE_IRQ=y \
CONFIG_SERIAL_8250_DETECT_IRQ=n \
CONFIG_SERIAL_8250_RSA=n
- FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(CONFIG_LINUX_3_8),_core).ko
+ FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko
endef
define KernelPackage/serial-8250/description
@@ -746,7 +746,7 @@ $(eval $(call KernelPackage,ikconfig))
define KernelPackage/zram
SUBMENU:=$(OTHER_MENU)
TITLE:=ZRAM
- DEPENDS:=+kmod-lib-lzo @!TARGET_ep93xx +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14):kmod-lib-lz4
+ DEPENDS:=+kmod-lib-lzo @!TARGET_ep93xx +(!LINUX_3_10&&!LINUX_3_14):kmod-lib-lz4
KCONFIG:= \
CONFIG_ZSMALLOC \
CONFIG_ZRAM \
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 3de5f27..e87a857 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -254,7 +254,7 @@ define KernelPackage/usb-eth-gadget
CONFIG_USB_ETH_RNDIS=y \
CONFIG_USB_ETH_EEM=n
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
-ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),)
+ifeq ($(CONFIG_LINUX_3_10),)
FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \
@@ -286,7 +286,6 @@ define KernelPackage/usb-serial-gadget
TITLE:=USB Serial Gadget support
KCONFIG:=CONFIG_USB_G_SERIAL
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
-ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8),)
FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko@ge3.18 \
@@ -299,10 +298,6 @@ ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8),)
$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko@lt3.18
AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial)
-else
- FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
- AUTOLOAD:=$(call AutoLoad,52,g_serial)
-endif
$(call AddDepends/usb)
endef
@@ -343,7 +338,7 @@ define KernelPackage/usb-ohci
CONFIG_USB_OHCI_HCD_OMAP3=y \
CONFIG_USB_OHCI_HCD_PLATFORM=y
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
-ifeq ($(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),)
+ifeq ($(CONFIG_LINUX_3_10),)
FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko
endif
AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1)
@@ -440,7 +435,7 @@ $(eval $(call KernelPackage,usb2-pci))
define KernelPackage/usb-dwc2
TITLE:=DWC2 USB controller driver
- DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 +(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx):kmod-usb-gadget
+ DEPENDS:=@!LINUX_3_10 +(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx):kmod-usb-gadget
KCONFIG:= \
CONFIG_USB_DWC2 \
CONFIG_USB_DWC2_PCI \
@@ -1258,7 +1253,7 @@ define KernelPackage/usb-net-huawei-cdc-ncm
KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM
FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko
AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm)
- $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm @!LINUX_3_8 @!LINUX_3_10)
+ $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm @!LINUX_3_10)
endef
define KernelPackage/usb-net-huawei-cdc-ncm/description
diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
index 21b212e..30ba0a8 100644
--- a/package/kernel/linux/modules/wireless.mk
+++ b/package/kernel/linux/modules/wireless.mk
@@ -110,7 +110,7 @@ $(eval $(call KernelPackage,net-prism54))
define KernelPackage/net-rtl8188eu
SUBMENU:=$(WIRELESS_MENU)
TITLE:=RTL8188EU support (staging)
- DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
+ DEPENDS:=@!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
KCONFIG:=\
CONFIG_STAGING=y \
CONFIG_R8188EU \