diff options
| author | Per Liden <per.liden@nospam.ericsson.com> | 2006-01-02 19:04:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-12 23:06:31 +0100 |
| commit | b97bf3fd8f6a16966d4f18983b2c40993ff937d4 (patch) | |
| tree | 59959f8a0f3087455efdcb430846686f303c5991 /net/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff) | |
| download | linux-b97bf3fd8f6a16966d4f18983b2c40993ff937d4.tar.xz linux-b97bf3fd8f6a16966d4f18983b2c40993ff937d4.zip | |
[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>
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index f5141b9d4f38..065796f5fb17 100644 --- a/net/Makefile +++ b/net/Makefile @@ -45,6 +45,7 @@ obj-$(CONFIG_VLAN_8021Q) += 8021q/ 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 |