kernel: move wpan to separate menu

[openwrt/staging/wigyori.git] / package / kernel / linux / modules / wpan.mk

diff --git a/package/kernel/linux/modules/wpan.mk b/package/kernel/linux/modules/wpan.mk
index 40abfcac6e7a011792daf3caeb821af6409cc0d0..9ba5631807aea894cad1797dbe2eb8b5e7549594 100644 (file)
--- a/package/kernel/linux/modules/wpan.mk
+++ b/package/kernel/linux/modules/wpan.mk
@@ -4,18 +4,18 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
-WPAN_MENU:=Wireless Drivers
+WPAN_MENU:=WPAN 802.15.4 Support
 
 define KernelPackage/ieee802154
   SUBMENU:=$(WPAN_MENU)
   TITLE:=IEEE-802.15.4 support
-  DEPENDS:=@!LINUX_4.0
+  DEPENDS:=@LINUX_4_0
   KCONFIG:= \
        CONFIG_IEEE802154 \
        CONFIG_IEEE802154_SOCKET=y
   FILES:= \
        $(LINUX_DIR)/net/ieee802154/ieee802154.ko \
-       $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko
+       $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko@ge4.0
   AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket)
 endef
 
@@ -32,11 +32,10 @@ $(eval $(call KernelPackage,ieee802154))
 define KernelPackage/mac802154
   SUBMENU:=$(WPAN_MENU)
   TITLE:=MAC-802.15.4 support
-  DEPENDS:=@!LINUX_4.0
+  DEPENDS:=+kmod-ieee802154 +kmod-crypto-aead +kmod-lib-crc-ccitt @LINUX_4_0
   KCONFIG:= \
        CONFIG_MAC802154 \
        CONFIG_IEEE802154_DRIVERS=y
-  DEPENDS:=+kmod-ieee802154 +kmod-crypto-aead +kmod-lib-crc-ccitt @!LINUX_4.0
   FILES:=$(LINUX_DIR)/net/mac802154/mac802154.ko
   AUTOLOAD:=$(call AutoLoad,91,mac802154)
 endef
@@ -56,7 +55,7 @@ $(eval $(call KernelPackage,mac802154))
 define KernelPackage/fakelb
   SUBMENU:=$(WPAN_MENU)
   TITLE:=Fake LR-WPAN driver
-  DEPENDS:=+kmod-mac802154 @!LINUX_4.0
+  DEPENDS:=+kmod-mac802154 @LINUX_4_0
   KCONFIG:=CONFIG_IEEE802154_FAKELB
   FILES:=$(LINUX_DIR)/drivers/net/ieee802154/fakelb.ko
   AUTOLOAD:=$(call AutoLoad,92,fakelb)
@@ -108,10 +107,11 @@ $(eval $(call KernelPackage,cc2520))
 define KernelPackage/ieee802154_6lowpan
   SUBMENU:=$(WPAN_MENU)
   TITLE:= 6LoWPAN support over IEEE-802.15.4
-  DEPENDS:=@!LINUX_4.0
+  DEPENDS:=@LINUX_4_0 +kmod-6lowpan
   KCONFIG:=CONFIG_IEEE802154_6LOWPAN
-  DEPENDS:=@!LINUX_4.0
-  FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko
+  FILES:= \
+       $(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko@ge4.0 \
+       $(LINUX_DIR)/net/ieee802154/ieee802154_6lowpan.ko@lt4.0
   AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan)
 endef