ar9170: single module build

This patch restores all-in-one module build procedure for ar9170.

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 5e7c9ac..50e7fba 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -57,6 +57,6 @@ obj-$(CONFIG_P54_COMMON)      += p54/
 
 obj-$(CONFIG_ATH5K)    += ath5k/
 obj-$(CONFIG_ATH9K)    += ath9k/
-obj-$(CONFIG_AR9170_COMMON)    += ar9170/
+obj-$(CONFIG_AR9170_USB)       += ar9170/
 
 obj-$(CONFIG_MAC80211_HWSIM)   += mac80211_hwsim.o

diff --cc drivers/net/wireless/ar9170/Kconfig
Simple merge

diff --cc drivers/net/wireless/ar9170/Makefile
Simple merge

diff --cc drivers/net/wireless/ar9170/cmd.c
Simple merge

diff --cc drivers/net/wireless/ar9170/main.c
Simple merge

diff --cc drivers/net/wireless/ar9170/usb.c
Simple merge