Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / net / wireless / Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 512603de309a4301fa26cf81a2cfc33b6e402a5c..d2124602263bf8f193d575428f1fc3b11825cece 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -36,9 +36,11 @@ obj-$(CONFIG_PRISM54)                += prism54/
 
 obj-$(CONFIG_HOSTAP)           += hostap/
 obj-$(CONFIG_BCM43XX)          += bcm43xx/
+obj-$(CONFIG_ZD1211RW)         += zd1211rw/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)     += ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)    += wl3501_cs.o
 
 obj-$(CONFIG_USB_ZD1201)       += zd1201.o
+obj-$(CONFIG_LIBERTAS_USB)     += libertas/