diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 16:11:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-01 16:11:48 -0400 |
| commit | e2cd68f7cd07cc898581bd736ebdd6f2c2323c2e (patch) | |
| tree | 074217d54d57d691fc39717f8ecfb569545ca315 /drivers/net | |
| parent | f9690f3681c891d37783e1d619fddeb93b68aac4 (diff) | |
| parent | f998351c755a0e87785f2616c4f91f1b3b19b149 (diff) | |
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
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index ef35bc6c4a22..4eb6d9752881 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
| @@ -43,7 +43,7 @@ obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o | |||
| 43 | obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o | 43 | obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o |
| 44 | 44 | ||
| 45 | obj-$(CONFIG_USB_ZD1201) += zd1201.o | 45 | obj-$(CONFIG_USB_ZD1201) += zd1201.o |
| 46 | obj-$(CONFIG_LIBERTAS_USB) += libertas/ | 46 | obj-$(CONFIG_LIBERTAS) += libertas/ |
| 47 | 47 | ||
| 48 | rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o | 48 | rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o |
| 49 | obj-$(CONFIG_RTL8187) += rtl8187.o | 49 | obj-$(CONFIG_RTL8187) += rtl8187.o |