diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /net/protocols.c | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'net/protocols.c')
| -rw-r--r-- | net/protocols.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/protocols.c b/net/protocols.c index 24e67cde1..a0bb0a6b8 100644 --- a/net/protocols.c +++ b/net/protocols.c @@ -47,6 +47,10 @@ extern void inet6_proto_init(struct net_proto *pro); #endif #endif +#if defined(CONFIG_DECNET) +#include <net/decnet_call.h> +#endif + #if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE) #define NEED_802 #include <net/atalkcall.h> @@ -107,9 +111,11 @@ struct net_proto protocols[] = { { "Rose", rose_proto_init }, /* Amateur Radio X.25 PLP */ #endif #endif - +#ifdef CONFIG_DECNET + { "DECnet", decnet_proto_init }, /* DECnet */ +#endif #ifdef CONFIG_INET - { "INET", inet_proto_init }, /* TCP/IP */ + { "INET", inet_proto_init }, /* TCP/IP */ #ifdef CONFIG_IPV6 { "INET6", inet6_proto_init}, /* IPv6 */ #endif |