ACPI: thinkpad-acpi: revert keymap changes

[linux-2.6] / net / mac80211 / Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index e9738dad2d7c22ac5fdc79b6a94c665337354639..219cd9f9341fe099bc0ce5ba69c2da7442339ab8 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -2,6 +2,7 @@ obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o
 
 mac80211-objs-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
 mac80211-objs-$(CONFIG_MAC80211_DEBUGFS) += debugfs.o debugfs_sta.o debugfs_netdev.o debugfs_key.o
+mac80211-objs-$(CONFIG_NET_SCHED) += wme.o
 
 mac80211-objs := \
        ieee80211.o \
@@ -13,8 +14,13 @@ mac80211-objs := \
        ieee80211_iface.o \
        ieee80211_rate.o \
        michael.o \
+       regdomain.o \
        tkip.o \
        aes_ccm.o \
-       wme.o \
-       ieee80211_cfg.o \
+       cfg.o \
+       rx.o \
+       tx.o \
+       key.o \
+       util.o \
+       event.o \
        $(mac80211-objs-y)