Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / drivers / net / wireless / Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 2426885..d780487 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -2,7 +2,8 @@
 # Makefile for the Linux Wireless network device drivers.
 #
 
-obj-$(CONFIG_IPW2100) += ipw2100.o
+obj-$(CONFIG_IPW2100) += ipw2x00/
+obj-$(CONFIG_IPW2200) += ipw2x00/
 
 obj-$(CONFIG_STRIP) += strip.o
 obj-$(CONFIG_ARLAN) += arlan.o 
@@ -14,12 +15,7 @@ obj-$(CONFIG_WAVELAN)                += wavelan.o
 obj-$(CONFIG_PCMCIA_NETWAVE)   += netwave_cs.o
 obj-$(CONFIG_PCMCIA_WAVELAN)   += wavelan_cs.o
 
-obj-$(CONFIG_HERMES)           += orinoco.o hermes.o
-obj-$(CONFIG_PCMCIA_HERMES)    += orinoco_cs.o
-obj-$(CONFIG_APPLE_AIRPORT)    += airport.o
-obj-$(CONFIG_PLX_HERMES)       += orinoco_plx.o
-obj-$(CONFIG_PCI_HERMES)       += orinoco_pci.o
-obj-$(CONFIG_TMD_HERMES)       += orinoco_tmd.o
+obj-$(CONFIG_HERMES)           += orinoco/
 
 obj-$(CONFIG_AIRO)             += airo.o
 obj-$(CONFIG_AIRO_CS)          += airo_cs.o airo.o
@@ -28,8 +24,38 @@ obj-$(CONFIG_ATMEL)             += atmel.o
 obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
 obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
 
+obj-$(CONFIG_AT76C50X_USB)      += at76c50x-usb.o
+
 obj-$(CONFIG_PRISM54)          += prism54/
 
+obj-$(CONFIG_HOSTAP)           += hostap/
+obj-$(CONFIG_B43)              += b43/
+obj-$(CONFIG_B43LEGACY)                += b43legacy/
+obj-$(CONFIG_ZD1211RW)         += zd1211rw/
+obj-$(CONFIG_RTL8180)          += rtl818x/
+obj-$(CONFIG_RTL8187)          += rtl818x/
+
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)     += ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)    += wl3501_cs.o
+
+obj-$(CONFIG_USB_NET_RNDIS_WLAN)       += rndis_wlan.o
+
+obj-$(CONFIG_USB_ZD1201)       += zd1201.o
+obj-$(CONFIG_LIBERTAS)         += libertas/
+
+obj-$(CONFIG_LIBERTAS_THINFIRM)        += libertas_tf/
+
+obj-$(CONFIG_ADM8211)  += adm8211.o
+
+obj-$(CONFIG_MWL8K)    += mwl8k.o
+
+obj-$(CONFIG_IWLWIFI)  += iwlwifi/
+obj-$(CONFIG_RT2X00)   += rt2x00/
+
+obj-$(CONFIG_P54_COMMON)       += p54/
+
+obj-$(CONFIG_ATH5K)    += ath5k/
+obj-$(CONFIG_ATH9K)    += ath9k/
+
+obj-$(CONFIG_MAC80211_HWSIM)   += mac80211_hwsim.o