Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

[linux-2.6] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 60f6f321bd7667a9d57ed03edb17c88ac0e4a0dc..9296b269d675771861bf1b2fc596dd31284faeeb 100644 (file)
--- 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)"