From ebd4f07fc78b97d5cc42c0831aaddcd9d4d45e36 Mon Sep 17 00:00:00 2001
From: "Carlos R. Mafra" <crmafra@ift.unesp.br>
Date: Wed, 23 Jul 2008 21:30:40 -0700
Subject: [PATCH] --- yaml --- r: 105485 b: refs/heads/master c:
 c68d07b2da54c941bb36c9d6d35fe8f263ee10ef h: refs/heads/master i:   105483:
 7fb5e891c98bc598bac82f2c373b9ed689d86053 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/char/rtc.c     | 2 --
 trunk/drivers/rtc/rtc-cmos.c | 5 ++++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 49d5e9f7a2b0..bb7b34bee6d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02bb584f3b1cfc8188522a4d2c8881b65073a4f1
+refs/heads/master: c68d07b2da54c941bb36c9d6d35fe8f263ee10ef
diff --git a/trunk/drivers/char/rtc.c b/trunk/drivers/char/rtc.c
index d1569a0d0506..dbefbb30ed44 100644
--- a/trunk/drivers/char/rtc.c
+++ b/trunk/drivers/char/rtc.c
@@ -121,8 +121,6 @@ static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
 	return 0;
 }
 #endif
-#else
-extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
 #endif
 
 /*
diff --git a/trunk/drivers/rtc/rtc-cmos.c b/trunk/drivers/rtc/rtc-cmos.c
index d7bb9bac71df..94b89a2d9c2e 100644
--- a/trunk/drivers/rtc/rtc-cmos.c
+++ b/trunk/drivers/rtc/rtc-cmos.c
@@ -52,7 +52,10 @@
 #define hpet_rtc_timer_init() 			do { } while (0)
 #define hpet_register_irq_handler(h) 		0
 #define hpet_unregister_irq_handler(h)		do { } while (0)
-extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
+static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
+{
+	return 0;
+}
 #endif
 
 struct cmos_rtc {