Merge branch 'eseries' into pxa

[linux-2.6] / net / mac80211 / Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 70f4b26c2d872d6859a87ce0f044d571259612ee..4e5847fd316c9870180720e815d7284793194526 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -10,14 +10,14 @@ rc-pid-m := rc80211_pid.o
 
 # mac80211 objects
 mac80211-y := \
-       ieee80211.o \
-       ieee80211_ioctl.o \
+       main.o \
+       wext.o \
        sta_info.o \
        wep.o \
        wpa.o \
-       ieee80211_sta.o \
-       ieee80211_iface.o \
-       ieee80211_rate.o \
+       mlme.o \
+       iface.o \
+       rate.o \
        michael.o \
        tkip.o \
        aes_ccm.o \
@@ -28,7 +28,7 @@ mac80211-y := \
        util.o \
        event.o
 
-mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
+mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_NET_SCHED) += wme.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
        debugfs.o \