diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-02 04:34:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-02 04:34:14 +0400 |
| commit | 05318bc905467237d4aa68a701f6e92a2b332218 (patch) | |
| tree | 3b7577383bca50aeb442568aa16cf8f2167b8694 /drivers/net/wireless/libertas/Makefile | |
| parent | ea812ca1b06113597adcd8e70c0f84a413d97544 (diff) | |
| parent | 88c1f4f6dffe66e2fed8e7e3276e091ee850bed0 (diff) | |
| download | linux-05318bc905467237d4aa68a701f6e92a2b332218.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/libertas/host.h
Diffstat (limited to 'drivers/net/wireless/libertas/Makefile')
| -rw-r--r-- | drivers/net/wireless/libertas/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile index 45e870e33117..f7d01bfa2e4a 100644 --- a/drivers/net/wireless/libertas/Makefile +++ b/drivers/net/wireless/libertas/Makefile @@ -1,4 +1,3 @@ -libertas-y += assoc.o libertas-y += cfg.o libertas-y += cmd.o libertas-y += cmdresp.o @@ -6,9 +5,7 @@ libertas-y += debugfs.o libertas-y += ethtool.o libertas-y += main.o libertas-y += rx.o -libertas-y += scan.o libertas-y += tx.o -libertas-y += wext.o libertas-$(CONFIG_LIBERTAS_MESH) += mesh.o usb8xxx-objs += if_usb.o |