From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758948AbZDFPkv (ORCPT ); Mon, 6 Apr 2009 11:40:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756871AbZDFPgE (ORCPT ); Mon, 6 Apr 2009 11:36:04 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:57002 "EHLO t61.ukuu.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754114AbZDFPgC (ORCPT ); Mon, 6 Apr 2009 11:36:02 -0400 From: Alan Cox Subject: [PATCH 21/27] mux: fix build problem To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Date: Mon, 06 Apr 2009 17:34:34 +0100 Message-ID: <20090406163432.12934.38714.stgit@t61.ukuu.org.uk> In-Reply-To: <20090406162959.12934.97904.stgit@t61.ukuu.org.uk> References: <20090406162959.12934.97904.stgit@t61.ukuu.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Beregalov 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 Signed-off-by: Alan Cox --- include/linux/serial_core.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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_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