diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /net/protocols.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/protocols.c')
| -rw-r--r-- | net/protocols.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/protocols.c b/net/protocols.c index 7516a0796..7de6a3bcb 100644 --- a/net/protocols.c +++ b/net/protocols.c @@ -100,6 +100,11 @@ extern void rif_init(struct net_proto *); #include <net/p8022call.h> #endif + +#ifdef CONFIG_PPPOE +#include <linux/if_pppox.h> +#endif + /* * Protocol Table */ @@ -177,6 +182,8 @@ struct net_proto protocols[] = { #ifdef CONFIG_IRDA { "IrDA", irda_proto_init }, /* IrDA protocols */ #endif - +#ifdef CONFIG_PPPOE + { "PPPoX", pppox_proto_init }, /* PPP over Ethernet */ +#endif { NULL, NULL } /* End marker */ }; |