The patch titled
rtc-cmos.c: build fix
has been removed from the -mm tree. Its filename was
rtc-cmosc-build-fix.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: rtc-cmos.c: build fix
From: "Carlos R. Mafra" <crmafra2@xxxxxxxxx>
The function hpet_rtc_interrupt(..) is to be used only if
CONFIG_HPET_EMULATE_RTC is defined (see arch/x86/kernel/hpet.c), so we define
it to return 0 when !CONFIG_HPET_EMULATE_RTC to avoid build failures.
This function will never be used anyways when !CONFIG_HPET_EMULATE_RTC because
it is inside a if(is_hpet_enabled()) which is never true when
!CONFIG_HPET_EMULATE_RTC.
Signed-off-by: Carlos R. Mafra <crmafra@xxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/rtc.c | 2 --
drivers/rtc/rtc-cmos.c | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/char/rtc.c~rtc-cmosc-build-fix drivers/char/rtc.c
--- a/drivers/char/rtc.c~rtc-cmosc-build-fix
+++ a/drivers/char/rtc.c
@@ -119,8 +119,6 @@ static irqreturn_t hpet_rtc_interrupt(in
return 0;
}
#endif
-#else
-extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
#endif
/*
diff -puN drivers/rtc/rtc-cmos.c~rtc-cmosc-build-fix drivers/rtc/rtc-cmos.c
--- a/drivers/rtc/rtc-cmos.c~rtc-cmosc-build-fix
+++ a/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 {
_
Patches currently in -mm which might be from crmafra2@xxxxxxxxx are
rtc-cmosc-build-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
