git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
serial
/
mux.c
diff --git
a/drivers/serial/mux.c
b/drivers/serial/mux.c
index
4a1c998
..
868eaf4
100644
(file)
--- a/
drivers/serial/mux.c
+++ b/
drivers/serial/mux.c
@@
-16,6
+16,7
@@
**
*/
**
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/tty.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/tty.h>
#include <linux/ioport.h>
@@
-50,7
+51,7
@@
#define MUX_BREAK(status) ((status & 0xF000) == 0x2000)
#define MUX_NR 256
#define MUX_BREAK(status) ((status & 0xF000) == 0x2000)
#define MUX_NR 256
-static unsigned int port_cnt
__read_mostly
;
+static unsigned int port_cnt
= 0
;
static struct uart_port mux_ports[MUX_NR];
static struct uart_driver mux_driver = {
static struct uart_port mux_ports[MUX_NR];
static struct uart_driver mux_driver = {
@@
-460,7
+461,7
@@
static int __init mux_probe(struct parisc_device *dev)
port->iobase = 0;
port->mapbase = dev->hpa.start + MUX_OFFSET +
(i * MUX_LINE_OFFSET);
port->iobase = 0;
port->mapbase = dev->hpa.start + MUX_OFFSET +
(i * MUX_LINE_OFFSET);
- port->membase = ioremap
_nocache
(port->mapbase, MUX_LINE_OFFSET);
+ port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET);
port->iotype = UPIO_MEM;
port->type = PORT_MUX;
port->irq = NO_IRQ;
port->iotype = UPIO_MEM;
port->type = PORT_MUX;
port->irq = NO_IRQ;