Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[pandora-kernel.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 6b74d41..bbe7d2a 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_AX25)            += ax25/
 obj-$(CONFIG_IRDA)             += irda/
 obj-$(CONFIG_BT)               += bluetooth/
 obj-$(CONFIG_SUNRPC)           += sunrpc/
-obj-$(CONFIG_RXRPC)            += rxrpc/
 obj-$(CONFIG_AF_RXRPC)         += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_DECNET)           += decnet/
@@ -45,13 +44,15 @@ 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/
+obj-$(CONFIG_NET_9P)           += 9p/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o
 endif
-
-obj-y                          += wireless/