diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
| commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
| tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /drivers/net/setup.c | |
| parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) | |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'drivers/net/setup.c')
| -rw-r--r-- | drivers/net/setup.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/setup.c b/drivers/net/setup.c index f8f59b9fb..12e51e458 100644 --- a/drivers/net/setup.c +++ b/drivers/net/setup.c @@ -9,7 +9,6 @@ #include <linux/netlink.h> extern int mkiss_init_ctrl_dev(void); -extern int ppp_init(void); extern int slip_init_ctrl_dev(void); extern int strip_init_ctrl_dev(void); extern int x25_asy_init_ctrl_dev(void); @@ -77,7 +76,7 @@ struct net_probe pci_probes[] __initdata = { {cpm_enet_init, 0}, #endif #if defined(CONFIG_COMX) - {comx_init(), 0}, + {comx_init, 0}, #endif /* * SLHC if present needs attaching so other people see it * even if not opened. @@ -167,9 +166,6 @@ static void __init network_ldisc_init(void) #if defined(CONFIG_STRIP) strip_init_ctrl_dev(); #endif -#if defined(CONFIG_PPP) - ppp_init(); -#endif } |