X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fserial_core.h;h=9963f81fea9a080e63b4093023ff7ad98f23a5ac;hb=0ba6c33bcddc64a54b5f1c25a696c4767dc76292;hp=4db77249281cc56d04d16dda5369af431a0a21fe;hpb=92d15c2ccbb3e31a3fc71ad28fdb55e1319383c0;p=linux-2.6 diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 4db7724928..9963f81fea 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -146,6 +146,9 @@ /* Broadcom SB1250, etc. SOC */ #define PORT_SB1250_DUART 77 +/* Freescale ColdFire */ +#define PORT_MCF 78 + #ifdef __KERNEL__ @@ -434,7 +437,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; }