5 files changed, 16 insertions, 13 deletions

diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index 8f1dd2cc00a8..f3d0edf46644 100644
--- a/drivers/tty/serial/8250/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
@@ -162,7 +162,7 @@ int __init hp300_setup_serial_console(void)
 static int __devinit hpdca_init_one(struct dio_dev *d,
                                 const struct dio_device_id *ent)
 {
-        struct uart_port port;
+        struct uart_8250_port uart;
         int line;
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -174,19 +174,19 @@ static int __devinit hpdca_init_one(struct dio_dev *d,
         memset(&uart, 0, sizeof(uart));
 
         /* Memory mapped I/O */
-        port.iotype = UPIO_MEM;
-        port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
-        port.irq = d->ipl;
-        port.uartclk = HPDCA_BAUD_BASE * 16;
-        port.mapbase = (d->resource.start + UART_OFFSET);
-        port.membase = (char *)(port.mapbase + DIO_VIRADDRBASE);
-        port.regshift = 1;
-        port.dev = &d->dev;
+        uart.port.iotype = UPIO_MEM;
+        uart.port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
+        uart.port.irq = d->ipl;
+        uart.port.uartclk = HPDCA_BAUD_BASE * 16;
+        uart.port.mapbase = (d->resource.start + UART_OFFSET);
+        uart.port.membase = (char *)(uart.port.mapbase + DIO_VIRADDRBASE);
+        uart.port.regshift = 1;
+        uart.port.dev = &d->dev;
         line = serial8250_register_8250_port(&uart);
 
         if (line < 0) {
                 printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d"
-                       " irq %d failed\n", d->scode, port.irq);
+                       " irq %d failed\n", d->scode, uart.port.irq);
                 return -ENOMEM;
         }
 
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 233fbaaf2559..2a53be5f010d 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1150,7 +1150,7 @@ config SERIAL_SC26XX_CONSOLE
           Support for Console on SC2681/SC2692 serial ports.
 
 config SERIAL_SCCNXP
-        bool "SCCNXP serial port support"
+        tristate "SCCNXP serial port support"
         depends on !SERIAL_SC26XX
         select SERIAL_CORE
         default n
@@ -1162,7 +1162,7 @@ config SERIAL_SCCNXP
 
 config SERIAL_SCCNXP_CONSOLE
         bool "Console on SCCNXP serial port"
-        depends on SERIAL_SCCNXP
+        depends on SERIAL_SCCNXP=y
         select SERIAL_CORE_CONSOLE
         help
           Support for console on SCCNXP serial ports.
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index b7086d004f5f..e821068cd95b 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -971,6 +971,7 @@ static const struct platform_device_id sccnxp_id_table[] = {
         { "sc28202",    SCCNXP_TYPE_SC28202 },
         { "sc68681",    SCCNXP_TYPE_SC68681 },
         { "sc68692",    SCCNXP_TYPE_SC68692 },
+        { },
 };
 MODULE_DEVICE_TABLE(platform, sccnxp_id_table);
 
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 9be296cf7295..6ee59001d61d 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -530,7 +530,8 @@ static inline int sci_rxd_in(struct uart_port *port)
         if (s->cfg->port_reg <= 0)
                 return 1;
 
-        return !!__raw_readb(s->cfg->port_reg);
+        /* Cast for ARM damage */
+        return !!__raw_readb((void __iomem *)s->cfg->port_reg);
 }
 
 /* ********************************************************************** *
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 05728894a88c..16ee6cee07da 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -452,6 +452,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
         NULL,                           /* v */
         &sysrq_showstate_blocked_op,    /* w */
         /* x: May be registered on ppc/powerpc for xmon */
+        /* x: May be registered on sparc64 for global PMU dump */
         NULL,                           /* x */
         /* y: May be registered on sparc64 for global register dump */
         NULL,                           /* y */