]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
mux: fix build problem
authorAlexander Beregalov <a.beregalov@gmail.com>
Mon, 6 Apr 2009 16:34:34 +0000 (17:34 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Apr 2009 21:36:35 +0000 (14:36 -0700)
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

index df9245c7bd3be3b384146434a0494eea946225dd..83e4b3ff9cdaeda28c6803776eafd67129c00993 100644 (file)
@@ -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