diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-21 12:46:39 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-21 12:46:54 +0400 |
| commit | 8ecee4620e76aae418bfa0e8cc830e92cb559bbb (patch) | |
| tree | 49a36784c0a26c8494a37087e37502101013b35d /include/linux/serial_core.h | |
| parent | 6424fb38667fffbbb1b90be0ffd9a0c540db6a4b (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
| download | linux-8ecee4620e76aae418bfa0e8cc830e92cb559bbb.tar.xz | |
Merge branch 'linus' into x86/mm
Merge reason: refresh the topic: there's been 290 non-merges commits upstream
to arch/x86 alone.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index df9245c7bd3b..57a97e52e58d 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 <linux/compiler.h> @@ -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 |