commit 70e5e983f8a3f801a96bfeb0682cd2955ec3c8ce
author John W. Linville <linville@tuxdriver.com> Mon Jan 23 17:00:39 2006 -0500
committer John W. Linville <linville@tuxdriver.com> Mon Mar 27 11:18:23 2006 -0500
tree 58eb5b61a48767304aea2c3ad2b042557a275d13
parent f222313a61a5e134de80767b35c672b91e78383c

[PATCH] bcm43xx: patch Kconfig and wireless/Makefile for import

Patch Kconfig and wireless/Makefile to merge bcm43xx 'properly'

Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 3a6f7ba..c867798 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -35,6 +35,7 @@
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
+obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o