diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:30:19 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:30:19 -0500 |
commit | e21a2b0cc5849e76434b37aff3a4b502c772f191 (patch) | |
tree | 2fad2f2025ca1d9e5bc88d4e835e07967b8fd762 /drivers/net/wireless/Makefile | |
parent | 8a89334caf80bb7c86383b73fd5a528cb88c696f (diff) | |
parent | 2638fed7ccb07ff43cdc109dd78e821efb629995 (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/Makefile | 1 |
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 | |||
35 | obj-$(CONFIG_PRISM54) += prism54/ | 35 | obj-$(CONFIG_PRISM54) += prism54/ |
36 | 36 | ||
37 | obj-$(CONFIG_HOSTAP) += hostap/ | 37 | obj-$(CONFIG_HOSTAP) += hostap/ |
38 | obj-$(CONFIG_BCM43XX) += bcm43xx/ | ||
38 | 39 | ||
39 | # 16-bit wireless PCMCIA client drivers | 40 | # 16-bit wireless PCMCIA client drivers |
40 | obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o | 41 | obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o |