From e64b5da7f6ba4640bd59244822ab3149bc307eae Mon Sep 17 00:00:00 2001 From: Per Liden Date: Mon, 16 Jan 2006 16:39:13 +0100 Subject: [PATCH] --- yaml --- r: 18877 b: refs/heads/master c: 1e63e681e06d438fdc542d40924a4f155d461bbd h: refs/heads/master i: 18875: c058da1f489cce8b9050ca00b4e00b5569c7e749 v: v3 --- [refs] | 2 +- trunk/net/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d283e432d3a..aabd799e2e38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c11ac3f236d73dd00c21ab4f06166606dea71ef3 +refs/heads/master: 1e63e681e06d438fdc542d40924a4f155d461bbd diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig index 9296b269d675..bc603d9aea56 100644 --- a/trunk/net/Kconfig +++ b/trunk/net/Kconfig @@ -150,6 +150,7 @@ endif source "net/dccp/Kconfig" source "net/sctp/Kconfig" +source "net/tipc/Kconfig" source "net/atm/Kconfig" source "net/bridge/Kconfig" source "net/8021q/Kconfig" @@ -159,7 +160,6 @@ 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)"