The patch titled m68knommu: remove duplicate hw_tick() code has been added to the -mm tree. Its filename is m68knommu-remove-duplicate-hw_tick-code.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: m68knommu: remove duplicate hw_tick() code From: Greg Ungerer <gerg@xxxxxxxxxxxx> Remove duplicate hw_tick() function from 68328 timers code. Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/m68knommu/platform/68328/timers.c | 10 ---------- 1 file changed, 10 deletions(-) diff -puN arch/m68knommu/platform/68328/timers.c~m68knommu-remove-duplicate-hw_tick-code arch/m68knommu/platform/68328/timers.c --- a/arch/m68knommu/platform/68328/timers.c~m68knommu-remove-duplicate-hw_tick-code +++ a/arch/m68knommu/platform/68328/timers.c @@ -67,16 +67,6 @@ static irqreturn_t hw_tick(int irq, void /***************************************************************************/ -static irqreturn_t hw_tick(int irq, void *dummy) -{ - /* Reset Timer1 */ - TSTAT &= 0; - - return arch_timer_interrupt(irq, dummy); -} - -/***************************************************************************/ - static struct irqaction m68328_timer_irq = { .name = "timer", .flags = IRQF_DISABLED | IRQF_TIMER, _ Patches currently in -mm which might be from gerg@xxxxxxxxxxxx are m68knommu-update-defconfig.patch m68knommu-remove-duplicate-hw_tick-code.patch m68knommu-declare-do_irq.patch m68knommu-fix-fec-driver-interrupt-races.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