X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-lh7a40x%2Ftime.c;fp=arch%2Farm%2Fmach-lh7a40x%2Ftime.c;h=be377e331f255baeceb7530f41dfbd00b8694c9c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=ad5652e0150719e7776a81c1b90afbdea5e6142f;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c
index ad5652e01..be377e331 100644
--- a/arch/arm/mach-lh7a40x/time.c
+++ b/arch/arm/mach-lh7a40x/time.c
@@ -1,4 +1,4 @@
-/*
+/* 
  *  arch/arm/mach-lh7a40x/time.c
  *
  *  Copyright (C) 2004 Logic Product Development
@@ -8,10 +8,10 @@
  *  version 2 as published by the Free Software Foundation.
  *
  */
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/time.h>
 
 #include <asm/hardware.h>
@@ -53,11 +53,11 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction lh7a40x_timer_irq = {
 	.name		= "LHA740x Timer Tick",
-	.flags		= IRQF_DISABLED | IRQF_TIMER,
+	.flags		= SA_INTERRUPT | SA_TIMER,
 	.handler	= lh7a40x_timer_interrupt,
 };
 
-static void __init lh7a40x_timer_init (void)
+static void __init lh7a40x_timer_init(void)
 {
 				/* Stop/disable all timers */
 	TIMER_CONTROL1 = 0;