commit e2cd68f7cd07cc898581bd736ebdd6f2c2323c2e
author Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Oct 01 13:11:48 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Oct 01 13:11:48 2007 -0700
tree 074217d54d57d691fc39717f8ecfb569545ca315
parent f9690f3681c891d37783e1d619fddeb93b68aac4
parent f998351c755a0e87785f2616c4f91f1b3b19b149

Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

* 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
  [PATCH] libertas: build problems when partially modular

drivers/net/wireless/Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index ef35bc6..4eb6d97 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -43,7 +43,7 @@
 obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
-obj-$(CONFIG_LIBERTAS_USB)     += libertas/
+obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 rtl8187-objs		:= rtl8187_dev.o rtl8187_rtl8225.o
 obj-$(CONFIG_RTL8187)	+= rtl8187.o