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/Kconfig | |
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/Kconfig')
-rw-r--r-- | net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index 60f6f321bd76..9296b269d675 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -159,6 +159,7 @@ source "net/ipx/Kconfig" source "drivers/net/appletalk/Kconfig" source "net/x25/Kconfig" source "net/lapb/Kconfig" +source "net/tipc/Kconfig" config NET_DIVERT bool "Frame Diverter (EXPERIMENTAL)" |