diff options
| author | Linus Torvalds | 2007-10-01 22:11:48 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-01 22:11:48 +0200 |
| commit | e2cd68f7cd07cc898581bd736ebdd6f2c2323c2e (patch) | |
| tree | 074217d54d57d691fc39717f8ecfb569545ca315 | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | [PATCH] libertas: build problems when partially modular (diff) | |
| download | kernel-qcow2-linux-e2cd68f7cd07cc898581bd736ebdd6f2c2323c2e.tar.gz kernel-qcow2-linux-e2cd68f7cd07cc898581bd736ebdd6f2c2323c2e.tar.xz kernel-qcow2-linux-e2cd68f7cd07cc898581bd736ebdd6f2c2323c2e.zip | |
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
| -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 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 |