summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 19:29:31 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 13:58:49 -0700
commit85ac3ab254405edcc7bef7d61b03930247882efc (patch)
treec04185d2c34b2be3abe8eaf4016696597321e852 /arch
parentb1e05aa2303e48b16e850c4be2513e60a3495238 (diff)
downloadtalos-obmc-linux-85ac3ab254405edcc7bef7d61b03930247882efc.tar.gz
talos-obmc-linux-85ac3ab254405edcc7bef7d61b03930247882efc.zip
[PATCH] irq-flags: XTENSA: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/xtensa/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 4a2c365ba684..412ab32de391 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -52,7 +52,7 @@ unsigned long long sched_clock(void)
static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);
static struct irqaction timer_irqaction = {
.handler = timer_interrupt,
- .flags = SA_INTERRUPT,
+ .flags = IRQF_DISABLED,
.name = "timer",
};
OpenPOWER on IntegriCloud