Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764528AbXEWM3W (ORCPT ); Wed, 23 May 2007 08:29:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754538AbXEWM3P (ORCPT ); Wed, 23 May 2007 08:29:15 -0400 Received: from rwcrmhc15.comcast.net ([216.148.227.155]:34273 "EHLO rwcrmhc15.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756559AbXEWM3O (ORCPT ); Wed, 23 May 2007 08:29:14 -0400 Subject: [PATCH 2.6.21-rt7] rtc_fix_missing_ENDIF From: Sven-Thorsten Dietrich To: LKML Cc: Ingo Molnar Content-Type: text/plain Content-Transfer-Encoding: 7bit Organization: The Big Corporation Date: Wed, 23 May 2007 05:29:12 -0700 Message-Id: <1179923352.25500.302.camel@sx.thebigcorporation.com> Mime-Version: 1.0 X-Mailer: Evolution 2.8.3 (2.8.3-2.fc6) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1064 Lines: 39 A change between rt6 and rt7 dropped a #endif in rtc.c. Compile fails on imbalanced pre-processor directives. I think that this is correct for Sparc and MIPS, and it definitely eliminates complaints about PCI_IRQ_NONE definitions for x86. signed-off-by: Sven-Thorsten Dietrich Index: linux-2.6.21/drivers/char/rtc.c =================================================================== --- linux-2.6.21.orig/drivers/char/rtc.c +++ linux-2.6.21/drivers/char/rtc.c @@ -93,13 +93,14 @@ #include #endif +static unsigned long rtc_port; +static int rtc_irq = PCI_IRQ_NONE; +#endif + #ifdef CONFIG_MIPS # include #endif -static unsigned long rtc_port; -static int rtc_irq = PCI_IRQ_NONE; - #ifdef CONFIG_RTC_HISTOGRAM static cycles_t last_interrupt_time; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/