diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/net/hamradio | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/pi2.c | 4 | ||||
| -rw-r--r-- | drivers/net/hamradio/pt.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/hamradio/pi2.c b/drivers/net/hamradio/pi2.c index 4f0150c37..12fc8e338 100644 --- a/drivers/net/hamradio/pi2.c +++ b/drivers/net/hamradio/pi2.c @@ -1182,7 +1182,7 @@ static void chipset_init(struct net_device *dev) } -int __init pi_init(void) +int __init pi2_init(void) { int *port; int ioaddr = 0; @@ -1658,7 +1658,7 @@ MODULE_DESCRIPTION("AX.25 driver for the Ottawa PI and PI/2 HDLC cards"); int init_module(void) { - return pi_init(); + return pi2_init(); } void cleanup_module(void) diff --git a/drivers/net/hamradio/pt.c b/drivers/net/hamradio/pt.c index 37cd118a4..ec9b196bb 100644 --- a/drivers/net/hamradio/pt.c +++ b/drivers/net/hamradio/pt.c @@ -474,7 +474,7 @@ static void chipset_init(struct net_device *dev) } /* chipset_init() */ -int __init pt_init(void) +int __init ptwin_init(void) { int *port; int ioaddr = 0; @@ -531,7 +531,7 @@ int __init pt_init(void) pt0b.irq = pt0a.irq; /* IRQ is shared */ return 0; -} /* pt_init() */ +} /* ptwin_init() */ /* * Probe for PT card. Also initialises the timers @@ -1758,7 +1758,7 @@ MODULE_DESCRIPTION("AX.25 driver for the Gracillis PacketTwin HDLC card"); int init_module(void) { - return pt_init(); + return ptwin_init(); } void cleanup_module(void) |