From 66c0d234cc2d6b075613e35b8bf42091ade60ae9 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <willy@parisc-linux.org>
Date: Fri, 21 Oct 2005 22:58:03 -0400
Subject: [PATCH] --- yaml --- r: 10515 b: refs/heads/master c:
 ae8c75c1c47029a64976690c37336a2be6b49778 h: refs/heads/master i:   10513:
 a605aca104168889b035ed82daf03fa8bb7b79fc   10511:
 a10d148bf538efb66beb10ed220b90548545ccb0 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/serial/8250_gsc.c | 1 -
 trunk/drivers/serial/mux.c      | 7 +++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 501ccdb65add..2665c1fea402 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27ee073cd2f72aa794299ef1ead31072f5176533
+refs/heads/master: ae8c75c1c47029a64976690c37336a2be6b49778
diff --git a/trunk/drivers/serial/8250_gsc.c b/trunk/drivers/serial/8250_gsc.c
index abc5a0cfe243..8b4947933d9b 100644
--- a/trunk/drivers/serial/8250_gsc.c
+++ b/trunk/drivers/serial/8250_gsc.c
@@ -29,7 +29,6 @@
 static int __init 
 serial_init_chip(struct parisc_device *dev)
 {
-	static int serial_line_nr;
 	struct uart_port port;
 	unsigned long address;
 	int err;
diff --git a/trunk/drivers/serial/mux.c b/trunk/drivers/serial/mux.c
index 009ce83c8ef5..660bae5ba179 100644
--- a/trunk/drivers/serial/mux.c
+++ b/trunk/drivers/serial/mux.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h> /* for udelay */
 #include <linux/device.h>
 #include <asm/io.h>
+#include <asm/irq.h>
 #include <asm/parisc-device.h>
 
 #ifdef CONFIG_MAGIC_SYSRQ
@@ -469,16 +470,18 @@ static int __init mux_probe(struct parisc_device *dev)
 	for(i = 0; i < ports; ++i, ++port_cnt) {
 		port = &mux_ports[port_cnt];
 		port->iobase	= 0;
-		port->mapbase	= dev->hpa + MUX_OFFSET + (i * MUX_LINE_OFFSET);
+		port->mapbase	= dev->hpa.start + MUX_OFFSET +
+						(i * MUX_LINE_OFFSET);
 		port->membase	= ioremap(port->mapbase, MUX_LINE_OFFSET);
 		port->iotype	= SERIAL_IO_MEM;
 		port->type	= PORT_MUX;
-		port->irq	= SERIAL_IRQ_NONE;
+		port->irq	= NO_IRQ;
 		port->uartclk	= 0;
 		port->fifosize	= MUX_FIFO_SIZE;
 		port->ops	= &mux_pops;
 		port->flags	= UPF_BOOT_AUTOCONF;
 		port->line	= port_cnt;
+		spin_lock_init(&port->lock);
 		status = uart_add_one_port(&mux_driver, port);
 		BUG_ON(status);
 	}