diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-19 19:00:00 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-19 19:00:00 +0100 |
| commit | d67df2b9edfc42ccc0a9ee5332e2821d487d6b3b (patch) | |
| tree | a6e40732cfeecebca79a76ef2bb28c428ba1ec18 /drivers/net/wireless/Makefile | |
| parent | net: fec: forbid FEC_PTP on SoCs that do not support (diff) | |
| parent | wireless: fix Atheros drivers compilation (diff) | |
| download | linux-d67df2b9edfc42ccc0a9ee5332e2821d487d6b3b.tar.xz linux-d67df2b9edfc42ccc0a9ee5332e2821d487d6b3b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -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 062dfdff6364..67156efe14c4 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/ obj-$(CONFIG_P54_COMMON) += p54/ -obj-$(CONFIG_ATH_COMMON) += ath/ +obj-$(CONFIG_ATH_CARDS) += ath/ obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o |