X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Flinux%2Fserial_core.h;h=57a97e52e58d0339d0e3dfd1271e143e865d68a4;hb=3c24475c1e4e8d10e50df161d8c4f1d382997a7c;hp=df9245c7bd3be3b384146434a0494eea946225dd;hpb=8ac65de6474e72f1cfc130e3cc1a4bfd5cf8e310;p=mv-sheeva.git diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index df9245c7bd3..57a97e52e58 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -164,6 +164,9 @@ /* NWPSERIAL */ #define PORT_NWPSERIAL 85 +/* MAX3100 */ +#define PORT_MAX3100 86 + #ifdef __KERNEL__ #include @@ -277,7 +280,7 @@ struct uart_port { struct uart_icount icount; /* statistics */ struct console *cons; /* struct console, if any */ -#ifdef CONFIG_SERIAL_CORE_CONSOLE +#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ) unsigned long sysrq; /* sysrq timeout */ #endif