Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / drivers / serial / sn_console.c

diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index ffaab9b90fd8fee79b1f0b6a30e02863b939e0a2..840815fde49b7e92f099e1e979413691b9a6975c 100644 (file)
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -572,6 +572,7 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
 
        if (uart_circ_empty(xmit) || uart_tx_stopped(&port->sc_port)) {
                /* Nothing to do. */
+               ia64_sn_console_intr_disable(SAL_CONSOLE_INTR_XMIT);
                return;
        }
 
@@ -787,7 +788,7 @@ static void __init sn_sal_switch_to_interrupts(struct sn_cons_port *port)
 
 static void sn_sal_console_write(struct console *, const char *, unsigned);
 static int __init sn_sal_console_setup(struct console *, char *);
-extern struct uart_driver sal_console_uart;
+static struct uart_driver sal_console_uart;
 extern struct tty_driver *uart_console_device(struct console *, int *);
 
 static struct console sal_console = {
@@ -801,7 +802,7 @@ static struct console sal_console = {
 
 #define SAL_CONSOLE    &sal_console
 
-struct uart_driver sal_console_uart = {
+static struct uart_driver sal_console_uart = {
        .owner = THIS_MODULE,
        .driver_name = "sn_console",
        .dev_name = DEVICE_NAME,