diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:48 -0400 |
| commit | 5fb55ae955cee254f9e3b45636266a4855bb88a5 (patch) | |
| tree | 26a41aed39c7476ca06bb2fe697b6c662f7d9427 /arch/sh64/kernel/time.c | |
| parent | dacdb3b23a918d52ff52708b25d6d45dab7ea14b (diff) | |
[PATCH] irq-flags: SH64: 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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh64/kernel/time.c')
| -rw-r--r-- | arch/sh64/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index ba9eb992f4a5..b8162e59030e 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
| @@ -484,8 +484,8 @@ static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id, | |||
| 484 | return IRQ_HANDLED; | 484 | return IRQ_HANDLED; |
| 485 | } | 485 | } |
| 486 | 486 | ||
| 487 | static struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL}; | 487 | static struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL}; |
| 488 | static struct irqaction irq1 = { sh64_rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL}; | 488 | static struct irqaction irq1 = { sh64_rtc_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "rtc", NULL, NULL}; |
| 489 | 489 | ||
| 490 | void __init time_init(void) | 490 | void __init time_init(void) |
| 491 | { | 491 | { |