Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[pandora-kernel.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 4f43e7f..27d1f10 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,6 +43,7 @@ obj-$(CONFIG_AF_RXRPC)                += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_DECNET)           += decnet/
 obj-$(CONFIG_ECONET)           += econet/
+obj-$(CONFIG_PHONET)           += phonet/
 ifneq ($(CONFIG_VLAN_8021Q),)
 obj-y                          += 8021q/
 endif