X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5..de61908068f0008dff424012f5083712ff1750e5:/package/kernel/modules/wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index e63039a28..6887a491a 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -6,12 +6,14 @@
 #
 # $Id$
 
-WIMENU:=Wireless Drivers
+WIRELESS_MENU:=Wireless Drivers
 
+# NOTE: dependency on 2.6 was removed since it was inherited by kmod-hostap 
+#       and prevented it from even showing up in menuconfig on 2.4
 define KernelPackage/ieee80211
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack
-  DEPENDS:=@LINUX_2_6 +kmod-crypto
+  DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic
   KCONFIG:= \
 	CONFIG_IEEE80211 \
 	CONFIG_IEEE80211_CRYPT_WEP \
@@ -46,7 +48,7 @@ $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC
@@ -62,9 +64,9 @@ $(eval $(call KernelPackage,ieee80211-softmac))
 
 
 define KernelPackage/net-bcm43xx
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Broadcom BCM43xx driver
-  DEPENDS:=kmod-ieee80211-softmac
+  DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +kmod-ieee80211-softmac
   KCONFIG:=CONFIG_BCM43XX
   FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
@@ -80,9 +82,9 @@ $(eval $(call KernelPackage,net-bcm43xx))
 
 
 define KernelPackage/net-ipw2100
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intel IPW2100 driver
-  DEPENDS:=kmod-ieee80211
+  DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2100
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2100)
@@ -98,9 +100,9 @@ $(eval $(call KernelPackage,net-ipw2100))
 
 
 define KernelPackage/net-ipw2200
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intel IPW2200 driver
-  DEPENDS:=kmod-ieee80211
+  DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2200
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2200)
@@ -116,8 +118,9 @@ $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
+  DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,airo)
@@ -131,9 +134,9 @@ $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Hermes 802.11b chipset support
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
   KCONFIG:=CONFIG_HERMES
   FILES:= \
 	$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
@@ -149,9 +152,9 @@ $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism 2.5 PCI support
-  DEPENDS:=kmod-net-hermes
+  DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PCI_HERMES
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
@@ -165,9 +168,9 @@ $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=PLX9052 based PCI adaptor
-  DEPENDS:=kmod-net-hermes
+  DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PLX_HERMES
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
@@ -181,8 +184,9 @@ $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
+  DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,prism54)
@@ -196,9 +200,9 @@ $(eval $(call KernelPackage,net-prism54))
 
 
 define KernelPackage/net-zd1211rw
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Zydas ZD1211 support
-  DEPENDS:=+kmod-ieee80211 +zd1211-firmware @LINUX_2_6
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211 +zd1211-firmware
   KCONFIG:=CONFIG_ZD1211RW
   FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,zd1211rw)