Merge branch 'linus' into x86/xen

[linux-2.6-omap-h63xx.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index b7a13643b5498baf8da7de4fe31dd18d6a598061..27d1f10dc0e078e06c030f385f78a00e924fe763 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_PACKET)          += packet/
 obj-$(CONFIG_NET_KEY)          += key/
 obj-$(CONFIG_NET_SCHED)                += sched/
 obj-$(CONFIG_BRIDGE)           += bridge/
+obj-$(CONFIG_NET_DSA)          += dsa/
 obj-$(CONFIG_IPX)              += ipx/
 obj-$(CONFIG_ATALK)            += appletalk/
 obj-$(CONFIG_WAN_ROUTER)       += wanrouter/
@@ -42,7 +43,10 @@ obj-$(CONFIG_AF_RXRPC)               += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_DECNET)           += decnet/
 obj-$(CONFIG_ECONET)           += econet/
-obj-$(CONFIG_VLAN_8021Q)       += 8021q/
+obj-$(CONFIG_PHONET)           += phonet/
+ifneq ($(CONFIG_VLAN_8021Q),)
+obj-y                          += 8021q/
+endif
 obj-$(CONFIG_IP_DCCP)          += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
 obj-y                          += wireless/