[orion]: the same DEFAULT_PACKAGES should be selected in the generic Makefile

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

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 9f498ee..f0dd3b8 100644 (file)
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -10,17 +10,16 @@ WIRELESS_MENU:=Wireless Drivers
 define KernelPackage/lib80211
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack
 define KernelPackage/lib80211
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack

-  DEPENDS:=@!LINUX_2_4

   KCONFIG:= \
        CONFIG_LIB80211 \
        CONFIG_LIB80211_CRYPT_WEP \
        CONFIG_LIB80211_CRYPT_TKIP \
        CONFIG_LIB80211_CRYPT_CCMP
   FILES:= \
   KCONFIG:= \
        CONFIG_LIB80211 \
        CONFIG_LIB80211_CRYPT_WEP \
        CONFIG_LIB80211_CRYPT_TKIP \
        CONFIG_LIB80211_CRYPT_CCMP
   FILES:= \

-       $(LINUX_DIR)/net/wireless/lib80211.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/net/wireless/lib80211.ko \
+       $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.ko \
+       $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.ko \
+       $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.ko

   AUTOLOAD:=$(call AutoLoad,10, \
        lib80211 \
        lib80211_crypt_wep \
   AUTOLOAD:=$(call AutoLoad,10, \
        lib80211 \
        lib80211_crypt_wep \


@@ -45,7 +44,7 @@ define KernelPackage/net-airo
   TITLE:=Cisco Aironet driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO
   TITLE:=Cisco Aironet driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO

-  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko

   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
 


@@ -59,11 +58,11 @@ $(eval $(call KernelPackage,net-airo))
 define KernelPackage/net-hermes
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Hermes 802.11b chipset support
 define KernelPackage/net-hermes
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Hermes 802.11b chipset support

-  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT

   KCONFIG:=CONFIG_HERMES \
        CONFIG_HERMES_CACHE_FW_ON_INIT=n
   FILES:= \
   KCONFIG:=CONFIG_HERMES \
        CONFIG_HERMES_CACHE_FW_ON_INIT=n
   FILES:= \

-       $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.ko

   AUTOLOAD:=$(call AutoLoad,50,orinoco)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,orinoco)
 endef
 


@@ -79,7 +78,7 @@ define KernelPackage/net-hermes-pci
   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

-  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko

   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
 
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
 


@@ -95,7 +94,7 @@ define KernelPackage/net-hermes-plx
   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

-  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko

   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
 
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
 


@@ -106,12 +105,28 @@ endef
 $(eval $(call KernelPackage,net-hermes-plx))
 
 
 $(eval $(call KernelPackage,net-hermes-plx))
 
 

+define KernelPackage/net-hermes-pcmcia
+  SUBMENU:=$(WIRELESS_MENU)
+  TITLE:=Hermes based PCMCIA adaptors
+  DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes
+  KCONFIG:=CONFIG_PCMCIA_HERMES
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko
+  AUTOLOAD:=$(call AutoLoad,55,orinoco_cs)
+endef
+
+define KernelPackage/net-hermes-pcmcia/description
+ Kernel modules for Hermes based PCMCIA adaptors
+endef
+
+$(eval $(call KernelPackage,net-hermes-pcmcia))
+
+

 define KernelPackage/net-prism54
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54
 define KernelPackage/net-prism54
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54

-  FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko

   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef
 
   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef