Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[mv-sheeva.git] / arch / arm / mach-ebsa110 / core.c

diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 8459431cfd71f4a9f38858bfbd147fe45eae28fa..7710e14b52684b095b5aa456fd80cd1f35b6ce90 100644 (file)
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -178,8 +178,6 @@ ebsa110_timer_interrupt(int irq, void *dev_id)
 {
        u32 count;
 
-       write_seqlock(&xtime_lock);
-
        /* latch and read timer 1 */
        __raw_writeb(0x40, PIT_CTRL);
        count = __raw_readb(PIT_T1);
@@ -192,14 +190,12 @@ ebsa110_timer_interrupt(int irq, void *dev_id)
 
        timer_tick();
 
-       write_sequnlock(&xtime_lock);
-
        return IRQ_HANDLED;
 }
 
 static struct irqaction ebsa110_timer_irq = {
        .name           = "EBSA110 Timer Tick",
-       .flags          = IRQF_DISABLED | IRQF_TIMER,
+       .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
        .handler        = ebsa110_timer_interrupt,
 };