From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Mon, 6 Apr 2009 16:34:34 +0000 (+0100)
Subject: mux: fix build problem
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06e82df015afad2d96d030f76f5e4d13e6dcdfa4;p=linux-beck.git

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>
---

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index df9245c7bd3b..83e4b3ff9cda 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