diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /net/protocols.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'net/protocols.c')
| -rw-r--r-- | net/protocols.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/protocols.c b/net/protocols.c index 2e2362b82..6ec830cca 100644 --- a/net/protocols.c +++ b/net/protocols.c @@ -22,6 +22,10 @@ extern void inet6_proto_init(struct net_proto *pro); #endif #endif /* INET */ +#ifdef CONFIG_ECONET +extern void econet_proto_init(struct net_proto *pro); +#endif + #ifdef CONFIG_NETLINK extern void netlink_proto_init(struct net_proto *pro); #endif @@ -153,5 +157,9 @@ struct net_proto protocols[] = { { "X.25", x25_proto_init }, /* CCITT X.25 Packet Layer */ #endif +#ifdef CONFIG_ECONET + { "Econet", econet_proto_init }, /* Acorn Econet */ +#endif + { NULL, NULL } /* End marker */ }; |