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 /drivers/net/hamradio/baycom_epp.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/net/hamradio/baycom_epp.c')
| -rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 2a2f4e909..f7b3156fc 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -1010,14 +1010,6 @@ static struct net_device_stats *baycom_get_stats(struct device *dev) /* --------------------------------------------------------------------- */ -static int epp_preempt(void *handle) -{ - /* we cannot relinquish the port in the middle of an operation */ - return 1; -} - -/* --------------------------------------------------------------------- */ - static void epp_wakeup(void *handle) { struct device *dev = (struct device *)handle; @@ -1070,8 +1062,8 @@ static int epp_open(struct device *dev) } #endif memset(&bc->modem, 0, sizeof(bc->modem)); - if (!(bc->pdev = parport_register_device(pp, dev->name, epp_preempt, epp_wakeup, - epp_interrupt, PARPORT_DEV_LURK, dev))) { + if (!(bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, + epp_interrupt, PARPORT_DEV_EXCL, dev))) { printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base); return -ENXIO; } @@ -1548,7 +1540,7 @@ __initfunc(void baycom_epp_setup(char *str, int *ints)) return; } baycom_ports[i].mode = str; - baycom_ports[i].irq = ints[1]; + baycom_ports[i].iobase = ints[1]; if (i < NR_PORTS-1) baycom_ports[i+1].mode = NULL; } |