PCI: Add DECLARE_PCI_DEVICE_TABLE macro

[linux-2.6-omap-h63xx.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 6a5203fb9cf1fdae9b7bbb9ff8cd6e36de374592..289942fc66553e0188c0ad70e4f6dc23be2922e1 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -149,6 +149,12 @@
 /* Freescale ColdFire */
 #define PORT_MCF       78
 
+#define PORT_SC26XX    79
+
+
+/* MN10300 on-chip UART numbers */
+#define PORT_MN10300           80
+#define PORT_MN10300_CTS       81
 
 #ifdef __KERNEL__
 
@@ -437,7 +443,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 #ifdef SUPPORT_SYSRQ
        if (port->sysrq) {
                if (ch && time_before(jiffies, port->sysrq)) {
-                       handle_sysrq(ch, port->info->tty);
+                       handle_sysrq(ch, port->info ? port->info->tty : NULL);
                        port->sysrq = 0;
                        return 1;
                }