aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-29 17:30:19 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-29 17:30:19 -0500
commite21a2b0cc5849e76434b37aff3a4b502c772f191 (patch)
tree2fad2f2025ca1d9e5bc88d4e835e07967b8fd762 /drivers/net/wireless/Makefile
parent8a89334caf80bb7c86383b73fd5a528cb88c696f (diff)
parent2638fed7ccb07ff43cdc109dd78e821efb629995 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/Makefile')
-rw-r--r--drivers/net/wireless/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 3a6f7ba326ca..c86779879361 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o
35obj-$(CONFIG_PRISM54) += prism54/ 35obj-$(CONFIG_PRISM54) += prism54/
36 36
37obj-$(CONFIG_HOSTAP) += hostap/ 37obj-$(CONFIG_HOSTAP) += hostap/
38obj-$(CONFIG_BCM43XX) += bcm43xx/
38 39
39# 16-bit wireless PCMCIA client drivers 40# 16-bit wireless PCMCIA client drivers
40obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o 41obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o