Fix the mac80211 installation, remove the in-kernel mac80211 package, thanks to Danie...

[openwrt/svn-archive/archive.git] / package / kernel / modules / wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 52de7cf66c45a213a28c6d3b63a9795167bb3c05..ff5f08a1b0043f764985e9b18bdf6c69ca574e48 100644 (file)
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -17,11 +17,11 @@ define KernelPackage/ieee80211
        - ieee80211 \\\
        - ieee80211_crypt_wep \\\
        - ieee80211_crypt_tkip \\\
-       - ieee80211_crytp_ccmp \\\
-  DEPENDS:=@LINUX_2_6 kmod-crypto
-  KCONFIG:=$(CONFIG_IEEE80211)
+       - ieee80211_crytp_ccmp
+  DEPENDS:=@LINUX_2_6 +kmod-crypto
+  KCONFIG:=CONFIG_IEEE80211
   FILES:= \
-       $(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/ieee80211/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,10, \
        ieee80211_crypt \
        ieee80211 \
@@ -37,15 +37,14 @@ $(eval $(call KernelPackage,ieee80211))
 define KernelPackage/ieee80211-softmac
   TITLE:=ieee80211 SoftMAC support
   DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+  KCONFIG:=CONFIG_IEEE80211_SOFTMAC
   FILES:= \
-       $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
   SUBMENU:=$(WIMENU)
 endef
 $(eval $(call KernelPackage,ieee80211-softmac))
 
-
 define KernelPackage/net-bcm43xx
   TITLE:=Broadcom BCM43xx driver
   DESCRIPTION:=\\\
@@ -53,8 +52,8 @@ define KernelPackage/net-bcm43xx
        Includes: \\\
        - bcm43xx
   DEPENDS:=kmod-ieee80211-softmac
-  KCONFIG:=$(CONFIG_BCM43XX)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_BCM43XX
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
   SUBMENU:=$(WIMENU)
 endef
@@ -67,8 +66,8 @@ define KernelPackage/net-ipw2100
        Includes: \\\
        - ipw2100
   DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IPW2100)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_IPW2100
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2100)
   SUBMENU:=$(WIMENU)
 endef
@@ -81,8 +80,8 @@ define KernelPackage/net-ipw2200
        Includes: \\\
        - ipw2200
   DEPENDS:=kmod-ieee80211
-  KCONFIG:=$(CONFIG_IPW2200)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_IPW2200
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2200)
   SUBMENU:=$(WIMENU)
 endef
@@ -92,9 +91,9 @@ $(eval $(call KernelPackage,net-ipw2200))
 define KernelPackage/net-airo
   TITLE:=Cisco Aironet driver
   DESCRIPTION:=Driver for Cisco Aironet cards
-  KCONFIG:=$(CONFIG_AIRO)
+  KCONFIG:=CONFIG_AIRO
   SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
 $(eval $(call KernelPackage,net-airo))
@@ -103,11 +102,12 @@ $(eval $(call KernelPackage,net-airo))
 define KernelPackage/net-hermes
   TITLE:=Hermes 802.11b chipset support
   DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
-  KCONFIG:=$(CONFIG_HERMES)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_HERMES
   SUBMENU:=$(WIMENU)
   FILES:= \
-       $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
+       $(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))
@@ -116,10 +116,11 @@ $(eval $(call KernelPackage,net-hermes))
 define KernelPackage/net-hermes-pci
   TITLE:=Intersil Prism 2.5 PCI support
   DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
-  KCONFIG:=$(CONFIG_PCI_HERMES)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_PCI_HERMES
   DEPENDS:=kmod-net-hermes
   SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
 $(eval $(call KernelPackage,net-hermes-pci))
@@ -128,10 +129,11 @@ $(eval $(call KernelPackage,net-hermes-pci))
 define KernelPackage/net-hermes-plx
   TITLE:=PLX9052 based PCI adaptor
   DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
-  KCONFIG:=$(CONFIG_PLX_HERMES)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_PLX_HERMES
   DEPENDS:=kmod-net-hermes
   SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
 $(eval $(call KernelPackage,net-hermes-plx))
@@ -140,11 +142,21 @@ $(eval $(call KernelPackage,net-hermes-plx))
 define KernelPackage/net-prism54
   TITLE:=Intersil Prism54 support
   DESCRIPTION:=Kernel modules for Intersil Prism54 support
-  KCONFIG:=$(CONFIG_PRISM54)
+  KCONFIG:=CONFIG_PRISM54
   SUBMENU:=$(WIMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,prism54)
+  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
+  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)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+endef
+$(eval $(call KernelPackage,net-zd1211rw))