commit 06e82df015afad2d96d030f76f5e4d13e6dcdfa4
author Alexander Beregalov <a.beregalov@gmail.com> Mon Apr 06 17:34:34 2009 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Apr 06 14:36:35 2009 -0700
tree 55726382b94f45095077fe904e8cb6970ab1fb5f
parent e713abead3324f6d4381a3d280b7ce35b7eadb7a

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>

include/linux/serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index df9245c..83e4b3f 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -277,7 +277,7 @@
 	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