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 0625e91b599584fa779437199ad09f4c2436114c..7a4647e78fd39c5c1d4bcd5afa8bf433d3649e5f 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -58,3 +58,7 @@ obj-$(CONFIG_P54_COMMON)      += p54/
 obj-$(CONFIG_ATH_COMMON)       += ath/
 
 obj-$(CONFIG_MAC80211_HWSIM)   += mac80211_hwsim.o
+
+obj-$(CONFIG_WL12XX)   += wl12xx/
+
+obj-$(CONFIG_IWM)      += iwmc3200wifi/