summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-04-06 17:34:34 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-06 14:36:35 -0700
commit06e82df015afad2d96d030f76f5e4d13e6dcdfa4 (patch)
tree55726382b94f45095077fe904e8cb6970ab1fb5f /include
parente713abead3324f6d4381a3d280b7ce35b7eadb7a (diff)
downloadlinux-3.10-06e82df015afad2d96d030f76f5e4d13e6dcdfa4.tar.gz
linux-3.10-06e82df015afad2d96d030f76f5e4d13e6dcdfa4.tar.bz2
linux-3.10-06e82df015afad2d96d030f76f5e4d13e6dcdfa4.zip
mux: fix build problem
Fixes: In file included from drivers/serial/mux.c:37: include/linux/serial_core.h: In function 'uart_handle_sysrq_char': include/linux/serial_core.h:467: error: 'struct uart_port' has no member named 'sysrq' include/linux/serial_core.h:468: error: 'struct uart_port' has no member named 'sysrq' Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/serial_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index df9245c7bd3..83e4b3ff9cd 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -277,7 +277,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