The patch titled rtc: remove and clarify unneeded externs has been added to the -mm tree. Its filename is rtc-remove-and-clarify-unneeded-externs.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rtc: remove and clarify unneeded externs From: Carlos R. Mafra <crmafra@xxxxxxxxxxxx> When CONFIG_HPET_EMULATE_RTC is defined the external declaration of hpet_rtc_interrupt is redundant due to the inclusion of hpet.h. When !CONFIG_HPET_EMULATE_RTC we make it clear that hpet_rtc_interrupt is not used by defining it to return zero. Signed-off-by: Carlos R. Mafra <crmafra@xxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> 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-remove-and-clarify-unneeded-externs drivers/char/rtc.c --- a/drivers/char/rtc.c~rtc-remove-and-clarify-unneeded-externs +++ 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-remove-and-clarify-unneeded-externs drivers/rtc/rtc-cmos.c --- a/drivers/rtc/rtc-cmos.c~rtc-remove-and-clarify-unneeded-externs +++ 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 crmafra@xxxxxxxxxxxx are rtc-remove-and-clarify-unneeded-externs.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