diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-25 19:36:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-25 19:36:46 -0400 |
| commit | 495a1b4eff1a216a3ea171ac137f1807e6555f52 (patch) | |
| tree | 72d059d6d66fac6a74df33bac2eb40dcd0ea0732 /drivers/net/wireless/ath/ar9170/Makefile | |
| parent | ad8affd972a705a38e769859c50ee8e749b631da (diff) | |
| parent | d3feaf5ad12259927039a675cfb25dc342b403ab (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
net/mac80211/pm.c
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/Makefile')
| -rw-r--r-- | drivers/net/wireless/ath/ar9170/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ar9170/Makefile b/drivers/net/wireless/ath/ar9170/Makefile new file mode 100644 index 000000000000..8d91c7ee3215 --- /dev/null +++ b/drivers/net/wireless/ath/ar9170/Makefile | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | ar9170usb-objs := usb.o main.o cmd.o mac.o phy.o led.o | ||
| 2 | |||
| 3 | obj-$(CONFIG_AR9170_USB) += ar9170usb.o | ||