[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead

[sfrench/cifs-2.6.git] / arch / arm / mach-clps7500 / core.c

diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index 4dde34f25e63320e518797f1d8336d363d3e87a3..cfd8aca9f7da27a822c58c087a93833e64d2f07e 100644 (file)
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -21,7 +21,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/hardware/iomd.h>
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -193,7 +193,11 @@ static struct irq_chip clps7500_no_chip = {
        .unmask = cl7500_no_action,
 };
 
-static struct irqaction irq_isa = { no_action, 0, CPU_MASK_NONE, "isa", NULL, NULL };
+static struct irqaction irq_isa = {
+       .handler = no_action,
+       .mask = CPU_MASK_NONE,
+       .name = "isa",
+};
 
 static void __init clps7500_init_irq(void)
 {
@@ -294,8 +298,6 @@ extern unsigned long ioc_timer_gettimeoffset(void);
 static irqreturn_t
 clps7500_timer_interrupt(int irq, void *dev_id)
 {
-       write_seqlock(&xtime_lock);
-
        timer_tick();
 
        /* Why not using do_leds interface?? */
@@ -309,8 +311,6 @@ clps7500_timer_interrupt(int irq, void *dev_id)
                }
        }
 
-       write_sequnlock(&xtime_lock);
-
        return IRQ_HANDLED;
 }