2007-05-23 12:29:22

by Sven-Thorsten Dietrich

[permalink] [raw]
Subject: [PATCH 2.6.21-rt7] rtc_fix_missing_ENDIF


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 <[email protected]>


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 <asm/isa.h>
#endif

+static unsigned long rtc_port;
+static int rtc_irq = PCI_IRQ_NONE;
+#endif
+
#ifdef CONFIG_MIPS
# include <asm/time.h>
#endif

-static unsigned long rtc_port;
-static int rtc_irq = PCI_IRQ_NONE;
-
#ifdef CONFIG_RTC_HISTOGRAM

static cycles_t last_interrupt_time;