X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/222c1e2350d58e5d2d6b3d0253226ed8beca81ae..720644c3ace1c13cde6f8de55bfce5b22295f9f1:/package/kernel/modules/wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 42460bc89..20999e1cc 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -9,6 +9,7 @@
 WIMENU:=Wireless Drivers
 
 define KernelPackage/ieee80211
+  SUBMENU:=$(WIMENU)
   TITLE:=802.11 Networking stack
   DESCRIPTION:=\\\
 	\\\
@@ -17,9 +18,9 @@ define KernelPackage/ieee80211
 	- ieee80211 \\\
 	- ieee80211_crypt_wep \\\
 	- ieee80211_crypt_tkip \\\
-	- ieee80211_crytp_ccmp \\\
+	- ieee80211_crytp_ccmp
   DEPENDS:=@LINUX_2_6 +kmod-crypto
-  KCONFIG:=$(CONFIG_IEEE80211)
+  KCONFIG:=CONFIG_IEEE80211
   FILES:= \
   	$(LINUX_DIR)/net/ieee80211/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,10, \
@@ -29,144 +30,147 @@ define KernelPackage/ieee80211
 	ieee80211_crypt_tkip \
 	ieee80211_crypt_ccmp \
   )
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
+  SUBMENU:=$(WIMENU)
   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+  KCONFIG:=CONFIG_IEEE80211_SOFTMAC
   FILES:= \
 	$(LINUX_DIR)/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,ieee80211-softmac))
 
-define KernelPackage/mac80211
-  TITLE:=mac80211 (Devicescape) support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=$(CONFIG_MAC80211)
-  FILES:= \
-  	$(LINUX_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
-  SUBMENU:=$(WIMENU)
- endef
-$(eval $(call KernelPackage,mac80211))
 
 define KernelPackage/net-bcm43xx
+  SUBMENU:=$(WIMENU)
   TITLE:=Broadcom BCM43xx driver
   DESCRIPTION:=\\\
 	\\\
 	Includes: \\\
 	- bcm43xx
   DEPENDS:=kmod-ieee80211-softmac
-  KCONFIG:=$(CONFIG_BCM43XX)
+  KCONFIG:=CONFIG_BCM43XX
   FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,net-bcm43xx))
 
+
 define KernelPackage/net-ipw2100
+  SUBMENU:=$(WIMENU)
   TITLE:=Intel IPW2100 driver
   DESCRIPTION:=\\\
 	\\\
 	Includes: \\\
 	- ipw2100
   DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IPW2100)
+  KCONFIG:=CONFIG_IPW2100
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2100)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,net-ipw2100))
 
+
 define KernelPackage/net-ipw2200
+  SUBMENU:=$(WIMENU)
   TITLE:=Intel IPW2200 driver
   DESCRIPTION:=\\\
 	\\\
 	Includes: \\\
 	- ipw2200
   DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IPW2200)
+  KCONFIG:=CONFIG_IPW2200
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2200)
-  SUBMENU:=$(WIMENU)
 endef
+
 $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
+  SUBMENU:=$(WIMENU)
   TITLE:=Cisco Aironet driver
   DESCRIPTION:=Driver for Cisco Aironet cards
-  KCONFIG:=$(CONFIG_AIRO)
-  SUBMENU:=$(WIMENU)
+  KCONFIG:=CONFIG_AIRO
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
+
 $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
+  SUBMENU:=$(WIMENU)
   TITLE:=Hermes 802.11b chipset support
   DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
-  KCONFIG:=$(CONFIG_HERMES)
-  SUBMENU:=$(WIMENU)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_HERMES
   FILES:= \
 	$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
 endef
+
 $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
+  SUBMENU:=$(WIMENU)
   TITLE:=Intersil Prism 2.5 PCI support
   DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
-  KCONFIG:=$(CONFIG_PCI_HERMES)
   DEPENDS:=kmod-net-hermes
+  KCONFIG:=CONFIG_PCI_HERMES
   SUBMENU:=$(WIMENU)
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
+
 $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
+  SUBMENU:=$(WIMENU)
   TITLE:=PLX9052 based PCI adaptor
   DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
-  KCONFIG:=$(CONFIG_PLX_HERMES)
   DEPENDS:=kmod-net-hermes
-  SUBMENU:=$(WIMENU)
+  KCONFIG:=CONFIG_PLX_HERMES
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
+
 $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
+  SUBMENU:=$(WIMENU)
   TITLE:=Intersil Prism54 support
   DESCRIPTION:=Kernel modules for Intersil Prism54 support
-  KCONFIG:=$(CONFIG_PRISM54)
+  KCONFIG:=CONFIG_PRISM54
   SUBMENU:=$(WIMENU)
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef
+
 $(eval $(call KernelPackage,net-prism54))
 
 
 define KernelPackage/net-zd1211rw
+  SUBMENU:=$(WIMENU)
   TITLE:=Zydas ZD1211 support
   DESCRIPTION:=Kernel modules Zydas ZD1211 support, kernel version
-  KCONFIG:=$(CONFIG_ZD1211RW)
   DEPENDS:=+kmod-ieee80211 +zd1211-firmware @LINUX_2_6
-  SUBMENU:=$(WIMENU)
+  KCONFIG:=CONFIG_ZD1211RW
   FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
 endef
+
 $(eval $(call KernelPackage,net-zd1211rw))