diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2009-11-17 04:06:48 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-02-27 12:31:09 -0500 |
commit | 80614e5ab1458ff3ccced4d6ba2fa386575c8d5c (patch) | |
tree | e34007d1ce2abb0c8c451764107973909798cac3 /arch/m68k/mac/via.c | |
parent | ec9cbe09899e36b5f216c3232215520dcf0320ab (diff) |
mac68k: replace mac68k SCC code with platform device
Remove the old 68k Mac serial port code and a lot of related cruft. Add
new SCC platform devices to mac 68k platform.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/via.c')
-rw-r--r-- | arch/m68k/mac/via.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 11bce3cb6482..e71166daec6a 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c | |||
@@ -84,8 +84,6 @@ void via_irq_enable(int irq); | |||
84 | void via_irq_disable(int irq); | 84 | void via_irq_disable(int irq); |
85 | void via_irq_clear(int irq); | 85 | void via_irq_clear(int irq); |
86 | 86 | ||
87 | extern irqreturn_t mac_scc_dispatch(int, void *); | ||
88 | |||
89 | /* | 87 | /* |
90 | * Initialize the VIAs | 88 | * Initialize the VIAs |
91 | * | 89 | * |
@@ -311,11 +309,6 @@ void __init via_register_interrupts(void) | |||
311 | if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, | 309 | if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, |
312 | "via2", (void *) via2)) | 310 | "via2", (void *) via2)) |
313 | pr_err("Couldn't register %s interrupt\n", "via2"); | 311 | pr_err("Couldn't register %s interrupt\n", "via2"); |
314 | if (!psc_present) { | ||
315 | if (request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK, | ||
316 | "scc", mac_scc_dispatch)) | ||
317 | pr_err("Couldn't register %s interrupt\n", "scc"); | ||
318 | } | ||
319 | if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, | 312 | if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq, |
320 | IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2)) | 313 | IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2)) |
321 | pr_err("Couldn't register %s interrupt\n", "nubus"); | 314 | pr_err("Couldn't register %s interrupt\n", "nubus"); |