diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 15:08:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 15:08:16 -0800 |
| commit | 097916ecafd3bbedbde3ba068522093bf72319b3 (patch) | |
| tree | 95b8f52826883ccb04086725f0b94186adc1566f /net/Kconfig | |
| parent | 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c (diff) | |
| parent | 29f8f63272bd286549d1c7f75ad22686191d35d8 (diff) | |
| download | blackbird-op-linux-097916ecafd3bbedbde3ba068522093bf72319b3.tar.gz blackbird-op-linux-097916ecafd3bbedbde3ba068522093bf72319b3.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Kconfig b/net/Kconfig index 9296b269d675..bc603d9aea56 100644 --- a/net/Kconfig +++ b/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)" |
