diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/serial/mux.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/serial/mux.c')
| -rw-r--r-- | drivers/serial/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 4e49168c3176..868eaf4a1a68 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
| @@ -462,7 +462,7 @@ static int __init mux_probe(struct parisc_device *dev) | |||
| 462 | port->mapbase = dev->hpa.start + MUX_OFFSET + | 462 | port->mapbase = dev->hpa.start + MUX_OFFSET + |
| 463 | (i * MUX_LINE_OFFSET); | 463 | (i * MUX_LINE_OFFSET); |
| 464 | port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET); | 464 | port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET); |
| 465 | port->iotype = SERIAL_IO_MEM; | 465 | port->iotype = UPIO_MEM; |
| 466 | port->type = PORT_MUX; | 466 | port->type = PORT_MUX; |
| 467 | port->irq = NO_IRQ; | 467 | port->irq = NO_IRQ; |
| 468 | port->uartclk = 0; | 468 | port->uartclk = 0; |