aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/hpet.c
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2008-01-30 07:33:31 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:31 -0500
commitf8f76481bc2803aea03ff213c7e1405b53f7e488 (patch)
tree5356ad1b63ed7b2e36c57102bbac3a1ce44427b9 /arch/x86/kernel/hpet.c
parent1bdbdaacf774f2979ed4cb0c4a4316c9e578c897 (diff)
rtc: use the IRQ callback interface in (old) RTC driver
the previous patch in the old RTC driver. It also removes the direct rtc_interrupt() call from arch/x86/kernel/hpetc.c so that there's finally no (code) dependency to CONFIG_RTC in arch/x86/kernel/hpet.c. Because of this, it's possible to compile the drivers/char/rtc.ko driver as module and still use the HPET emulation functionality. This is also expressed in Kconfig. Signed-off-by: Bernhard Walle <bwalle@suse.de> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: David Brownell <david-b@pacbell.net> Cc: Andi Kleen <ak@suse.de> Cc: john stultz <johnstul@us.ibm.com> Cc: Robert Picco <Robert.Picco@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r--arch/x86/kernel/hpet.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index d65ced59a18f..429d084e014d 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -705,8 +705,6 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
705 rtc_int_flag |= (RTC_IRQF | (RTC_NUM_INTS << 8)); 705 rtc_int_flag |= (RTC_IRQF | (RTC_NUM_INTS << 8));
706 if (irq_handler) 706 if (irq_handler)
707 irq_handler(rtc_int_flag, dev_id); 707 irq_handler(rtc_int_flag, dev_id);
708
709 rtc_interrupt(rtc_int_flag, dev_id);
710 } 708 }
711 return IRQ_HANDLED; 709 return IRQ_HANDLED;
712} 710}