diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-29 09:16:25 +0200 |
| commit | 348b346b238d9c0e5694c8d0b835a099cb383835 (patch) | |
| tree | 967d9c72a1d6d33a408a1ff0d732296dbe8d3674 /drivers/net/wireless/Makefile | |
| parent | 6c697bdf08a09ce461e305a22362973036e95db3 (diff) | |
| parent | 52989765629e7d182b4f146050ebba0abf2cb0b7 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we will merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 50e7fba7f0e..7a4647e78fd 100644 --- 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/ |