fix the sdk

[openwrt.git] / package / kernel / modules / wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index c44a628..6887a49 100644 (file)
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -6,12 +6,14 @@
 #
 # $Id$
 
 #
 # $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
 define KernelPackage/ieee80211

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=802.11 Networking stack
   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 \
   KCONFIG:= \
        CONFIG_IEEE80211 \
        CONFIG_IEEE80211_CRYPT_WEP \


@@ -46,7 +48,7 @@ $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
 
 
 define KernelPackage/ieee80211-softmac

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC
   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC


@@ -62,9 +64,9 @@ $(eval $(call KernelPackage,ieee80211-softmac))
 
 
 define KernelPackage/net-bcm43xx
 
 
 define KernelPackage/net-bcm43xx

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Broadcom BCM43xx driver
   TITLE:=Broadcom BCM43xx driver

-  DEPENDS:=@PCI_SUPPORT +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)
   KCONFIG:=CONFIG_BCM43XX
   FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)


@@ -80,7 +82,7 @@ $(eval $(call KernelPackage,net-bcm43xx))
 
 
 define KernelPackage/net-ipw2100
 
 
 define KernelPackage/net-ipw2100

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intel IPW2100 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2100
   TITLE:=Intel IPW2100 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2100


@@ -98,7 +100,7 @@ $(eval $(call KernelPackage,net-ipw2100))
 
 
 define KernelPackage/net-ipw2200
 
 
 define KernelPackage/net-ipw2200

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intel IPW2200 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2200
   TITLE:=Intel IPW2200 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2200


@@ -116,7 +118,7 @@ $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
 
 
 define KernelPackage/net-airo

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Cisco Aironet driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO
   TITLE:=Cisco Aironet driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO


@@ -132,7 +134,7 @@ $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
 
 
 define KernelPackage/net-hermes

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Hermes 802.11b chipset support
   DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
   KCONFIG:=CONFIG_HERMES
   TITLE:=Hermes 802.11b chipset support
   DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
   KCONFIG:=CONFIG_HERMES


@@ -150,7 +152,7 @@ $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
 
 
 define KernelPackage/net-hermes-pci

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intersil Prism 2.5 PCI support
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PCI_HERMES
   TITLE:=Intersil Prism 2.5 PCI support
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PCI_HERMES


@@ -166,7 +168,7 @@ $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
 
 
 define KernelPackage/net-hermes-plx

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=PLX9052 based PCI adaptor
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PLX_HERMES
   TITLE:=PLX9052 based PCI adaptor
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PLX_HERMES


@@ -182,7 +184,7 @@ $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
 
 
 define KernelPackage/net-prism54

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intersil Prism54 support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54
   TITLE:=Intersil Prism54 support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54


@@ -198,7 +200,7 @@ $(eval $(call KernelPackage,net-prism54))
 
 
 define KernelPackage/net-zd1211rw
 
 
 define KernelPackage/net-zd1211rw

-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Zydas ZD1211 support
   DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211 +zd1211-firmware
   KCONFIG:=CONFIG_ZD1211RW
   TITLE:=Zydas ZD1211 support
   DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211 +zd1211-firmware
   KCONFIG:=CONFIG_ZD1211RW