aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac/oss.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-07-13 16:33:13 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:48 -0500
commit5a2394534b160ce18f9a705cf9de40e77648f8a2 (patch)
tree38d679c3633b4d2154ec68dbcc17ba2c207afb83 /arch/m68k/mac/oss.c
parent1425df87c25b15400c9f26d57821bcfe01286b2a (diff)
m68k/irq: Remove obsolete IRQ_FLG_* users
The m68k core irq code stopped honoring these flags during the irq restructuring in 2006. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/oss.c')
-rw-r--r--arch/m68k/mac/oss.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index ad512419affc..1eb60f071007 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -65,17 +65,14 @@ void __init oss_init(void)
65 65
66void __init oss_register_interrupts(void) 66void __init oss_register_interrupts(void)
67{ 67{
68 if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK, 68 if (request_irq(OSS_IRQLEV_SCSI, oss_irq, 0, "scsi", (void *)oss))
69 "scsi", (void *) oss))
70 pr_err("Couldn't register %s interrupt\n", "scsi"); 69 pr_err("Couldn't register %s interrupt\n", "scsi");
71 if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK, 70 if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, 0, "nubus",
72 "nubus", (void *) oss)) 71 (void *)oss))
73 pr_err("Couldn't register %s interrupt\n", "nubus"); 72 pr_err("Couldn't register %s interrupt\n", "nubus");
74 if (request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK, 73 if (request_irq(OSS_IRQLEV_SOUND, oss_irq, 0, "sound", (void *)oss))
75 "sound", (void *) oss))
76 pr_err("Couldn't register %s interrupt\n", "sound"); 74 pr_err("Couldn't register %s interrupt\n", "sound");
77 if (request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK, 75 if (request_irq(OSS_IRQLEV_VIA1, via1_irq, 0, "via1", (void *)via1))
78 "via1", (void *) via1))
79 pr_err("Couldn't register %s interrupt\n", "via1"); 76 pr_err("Couldn't register %s interrupt\n", "via1");
80} 77}
81 78