Merge branch 'linux-2.6'

1 files changed, 3 insertions, 2 deletions

diff --git a/net/Makefile b/net/Makefile
index 6b74d4118c5b..34e5b2d7f877 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -45,13 +45,14 @@ obj-$(CONFIG_ECONET)		+= econet/
 obj-$(CONFIG_VLAN_8021Q)        += 8021q/
 obj-$(CONFIG_IP_DCCP)           += dccp/
 obj-$(CONFIG_IP_SCTP)           += sctp/
+obj-y                           += wireless/
+obj-$(CONFIG_MAC80211)          += mac80211/
 obj-$(CONFIG_IEEE80211)         += ieee80211/
 obj-$(CONFIG_TIPC)              += tipc/
 obj-$(CONFIG_NETLABEL)          += netlabel/
 obj-$(CONFIG_IUCV)              += iucv/
+obj-$(CONFIG_RFKILL)            += rfkill/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)            += sysctl_net.o
 endif
-
-obj-y                           += wireless/