diff options
Diffstat (limited to 'arch/m68k/mac/iop.c')
-rw-r--r-- | arch/m68k/mac/iop.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index a5462cc0bfd6..7d8d46127ad9 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c | |||
@@ -115,7 +115,6 @@ | |||
115 | #include <asm/macintosh.h> | 115 | #include <asm/macintosh.h> |
116 | #include <asm/macints.h> | 116 | #include <asm/macints.h> |
117 | #include <asm/mac_iop.h> | 117 | #include <asm/mac_iop.h> |
118 | #include <asm/mac_oss.h> | ||
119 | 118 | ||
120 | /*#define DEBUG_IOP*/ | 119 | /*#define DEBUG_IOP*/ |
121 | 120 | ||
@@ -149,8 +148,6 @@ static struct listener iop_listeners[NUM_IOPS][NUM_IOP_CHAN]; | |||
149 | 148 | ||
150 | irqreturn_t iop_ism_irq(int, void *); | 149 | irqreturn_t iop_ism_irq(int, void *); |
151 | 150 | ||
152 | extern void oss_irq_enable(int); | ||
153 | |||
154 | /* | 151 | /* |
155 | * Private access functions | 152 | * Private access functions |
156 | */ | 153 | */ |
@@ -304,11 +301,10 @@ void __init iop_init(void) | |||
304 | void __init iop_register_interrupts(void) | 301 | void __init iop_register_interrupts(void) |
305 | { | 302 | { |
306 | if (iop_ism_present) { | 303 | if (iop_ism_present) { |
307 | if (oss_present) { | 304 | if (macintosh_config->ident == MAC_MODEL_IIFX) { |
308 | if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 0, | 305 | if (request_irq(IRQ_MAC_ADB, iop_ism_irq, 0, |
309 | "ISM IOP", (void *)IOP_NUM_ISM)) | 306 | "ISM IOP", (void *)IOP_NUM_ISM)) |
310 | pr_err("Couldn't register ISM IOP interrupt\n"); | 307 | pr_err("Couldn't register ISM IOP interrupt\n"); |
311 | oss_irq_enable(IRQ_MAC_ADB); | ||
312 | } else { | 308 | } else { |
313 | if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP", | 309 | if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP", |
314 | (void *)IOP_NUM_ISM)) | 310 | (void *)IOP_NUM_ISM)) |