Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / net / wireless / Makefile

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 50e7fba7f0ea95b1922a6bcf3938420295d83ad7..7a4647e78fd39c5c1d4bcd5afa8bf433d3649e5f 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -55,8 +55,10 @@ obj-$(CONFIG_RT2X00) += rt2x00/
 
 obj-$(CONFIG_P54_COMMON)       += p54/
 
-obj-$(CONFIG_ATH5K)    += ath5k/
-obj-$(CONFIG_ATH9K)    += ath9k/
-obj-$(CONFIG_AR9170_USB)       += ar9170/
+obj-$(CONFIG_ATH_COMMON)       += ath/
 
 obj-$(CONFIG_MAC80211_HWSIM)   += mac80211_hwsim.o
+
+obj-$(CONFIG_WL12XX)   += wl12xx/
+
+obj-$(CONFIG_IWM)      += iwmc3200wifi/