commit b97bf3fd8f6a16966d4f18983b2c40993ff937d4
author Per Liden <per.liden@nospam.ericsson.com> Mon Jan 02 19:04:38 2006 +0100
committer David S. Miller <davem@sunset.davemloft.net> Thu Jan 12 14:06:31 2006 -0800
tree 59959f8a0f3087455efdcb430846686f303c5991
parent 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9

[TIPC] Initial merge

TIPC (Transparent Inter Process Communication) is a protocol designed for
intra cluster communication. For more information see
http://tipc.sourceforge.net

Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>

net/Makefile

diff --git a/net/Makefile b/net/Makefile
index f5141b9..065796f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -45,6 +45,7 @@
 obj-$(CONFIG_IP_DCCP)		+= dccp/
 obj-$(CONFIG_IP_SCTP)		+= sctp/
 obj-$(CONFIG_IEEE80211)		+= ieee80211/
+obj-$(CONFIG_TIPC)		+= tipc/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)		+= sysctl_net.o