bluetooth: set L2CAP and SCO kconfig options to =y. It should be forced to =m for...

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

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 82680e3..ee0f965 100644 (file)
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -7,42 +7,10 @@
 
 WIRELESS_MENU:=Wireless Drivers
 
 
 WIRELESS_MENU:=Wireless Drivers
 

-define KernelPackage/lib80211
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=802.11 Networking stack
-  KCONFIG:= \
-       CONFIG_LIB80211 \
-       CONFIG_LIB80211_CRYPT_WEP \
-       CONFIG_LIB80211_CRYPT_TKIP \
-       CONFIG_LIB80211_CRYPT_CCMP
-  FILES:= \
-       $(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 \
-       lib80211_crypt_ccmp \
-       lib80211_crypt_tkip \
-  )
-endef
-
-define KernelPackage/lib80211/description
- Kernel modules for 802.11 Networking stack
- Includes:
- - lib80211
- - lib80211_crypt_wep
- - lib80211_crypt_tkip
- - lib80211_crytp_ccmp
-endef
-
-$(eval $(call KernelPackage,lib80211))
-

 define KernelPackage/net-airo
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
 define KernelPackage/net-airo
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver

-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT

   KCONFIG:=CONFIG_AIRO
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko
   AUTOLOAD:=$(call AutoLoad,50,airo)
   KCONFIG:=CONFIG_AIRO
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko
   AUTOLOAD:=$(call AutoLoad,50,airo)


@@ -58,9 +26,9 @@ $(eval $(call KernelPackage,net-airo))
 define KernelPackage/net-zd1201
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Zydas ZD1201 support
 define KernelPackage/net-zd1201
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Zydas ZD1201 support

-  DEPENDS:=@USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT

   KCONFIG:=CONFIG_USB_ZD1201
   KCONFIG:=CONFIG_USB_ZD1201

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

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


@@ -112,7 +80,7 @@ $(eval $(call KernelPackage,net-zd1201))
 define KernelPackage/net-prism54
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
 define KernelPackage/net-prism54
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support

-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT

   KCONFIG:=CONFIG_PRISM54
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko
   AUTOLOAD:=$(call AutoLoad,60,prism54)
   KCONFIG:=CONFIG_PRISM54
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko
   AUTOLOAD:=$(call AutoLoad,60,prism54)