diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
| commit | ea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch) | |
| tree | 4c859976b6acc1301d2c8822be6f21b0381f45fc /drivers/serial/mux.c | |
| parent | 8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/mux.c')
| -rw-r--r-- | drivers/serial/mux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 868eaf4a1a68..64c0e89124c9 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
| @@ -51,7 +51,7 @@ | |||
| 51 | #define MUX_BREAK(status) ((status & 0xF000) == 0x2000) | 51 | #define MUX_BREAK(status) ((status & 0xF000) == 0x2000) |
| 52 | 52 | ||
| 53 | #define MUX_NR 256 | 53 | #define MUX_NR 256 |
| 54 | static unsigned int port_cnt = 0; | 54 | static unsigned int port_cnt __read_mostly; |
| 55 | static struct uart_port mux_ports[MUX_NR]; | 55 | static struct uart_port mux_ports[MUX_NR]; |
| 56 | 56 | ||
| 57 | static struct uart_driver mux_driver = { | 57 | static struct uart_driver mux_driver = { |
| @@ -461,7 +461,7 @@ static int __init mux_probe(struct parisc_device *dev) | |||
| 461 | port->iobase = 0; | 461 | port->iobase = 0; |
| 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_nocache(port->mapbase, MUX_LINE_OFFSET); |
| 465 | port->iotype = UPIO_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; |