diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-06-12 22:27:30 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-06-12 22:27:30 -0400 |
| commit | 12b90de64f38226e1e095c55b533f0f4d4f0f572 (patch) | |
| tree | 9955197d842511064a1eff6db815fe56cd8f0eb3 /drivers/net/wireless/libertas/Makefile | |
| parent | 6f8a7c66e2dc8080950d28edc0259f37739aead9 (diff) | |
| parent | 717c9339202a42ae7bec7d3c4b84deecdcae9f81 (diff) | |
Merge branch 'libertas' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/libertas/Makefile')
| -rw-r--r-- | drivers/net/wireless/libertas/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile index 56a8ea1fbf0..a1097f59fd4 100644 --- a/drivers/net/wireless/libertas/Makefile +++ b/drivers/net/wireless/libertas/Makefile @@ -1,4 +1,4 @@ -usb8xxx-objs := main.o fw.o wext.o \ +libertas-objs := main.o fw.o wext.o \ rx.o tx.o cmd.o \ cmdresp.o scan.o \ join.o 11d.o \ @@ -8,5 +8,5 @@ usb8xxx-objs := main.o fw.o wext.o \ usb8xxx-objs += if_bootcmd.o usb8xxx-objs += if_usb.o +obj-$(CONFIG_LIBERTAS) += libertas.o obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o - |