X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Fmux.c;fp=drivers%2Fserial%2Fmux.c;h=868eaf4a1a68c08a533c8676243d27b06f0b0534;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=4a1c9983f38f8e38a78e47f761b996da129c6969;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index 4a1c9983f..868eaf4a1 100644
--- 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>
@@ -50,7 +51,7 @@
 #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 = {
@@ -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->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;