projects/linux·commit e2cd68f7

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

e2cd68f7 · Linus Torvalds <[email protected]> · 2007-10-01 13:11:48 -07:00

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

Merge commit. Changes below are compared with the first parent: f9690f36.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/net/wireless/Makefilemodified+1−1View file

drivers/net/wireless/Makefile

View file
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_RAYCS) += ray_cs.o
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