Merge branch 'x86/fpu' into x86/urgent

[pandora-kernel.git] / arch / arm / mach-pnx4008 / time.c

diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c
index 67e05f0..1809752 100644 (file)
--- a/arch/arm/mach-pnx4008/time.c
+++ b/arch/arm/mach-pnx4008/time.c
@@ -24,7 +24,7 @@
 #include <linux/irq.h>
 
 #include <asm/system.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/mach/time.h>
@@ -51,8 +51,6 @@ static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id)
 {
        if (__raw_readl(HSTIM_INT) & MATCH0_INT) {
 
-               write_seqlock(&xtime_lock);
-
                do {
                        timer_tick();
 
@@ -73,8 +71,6 @@ static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id)
                } while ((signed)
                         (__raw_readl(HSTIM_MATCH0) -
                          __raw_readl(HSTIM_COUNTER)) < 0);
-
-               write_sequnlock(&xtime_lock);
        }
 
        return IRQ_HANDLED;