Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / m68k / mac / oss.c

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index f3d23d6ebcf8a7ba35e7b07e70e0d4b7276f6ebb..a9c0f5ab4cc0251213dd8e1e034f7007d9d8a6d9 100644 (file)
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -33,7 +33,6 @@ static irqreturn_t oss_irq(int, void *);
 static irqreturn_t oss_nubus_irq(int, void *);
 
 extern irqreturn_t via1_irq(int, void *);
-extern irqreturn_t mac_scc_dispatch(int, void *);
 
 /*
  * Initialize the OSS
@@ -69,9 +68,6 @@ void __init oss_register_interrupts(void)
        if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
                        "scsi", (void *) oss))
                pr_err("Couldn't register %s interrupt\n", "scsi");
-       if (request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,
-                       "scc", mac_scc_dispatch))
-               pr_err("Couldn't register %s interrupt\n", "scc");
        if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
                        "nubus", (void *) oss))
                pr_err("Couldn't register %s interrupt\n", "nubus");
@@ -172,9 +168,7 @@ void oss_irq_enable(int irq) {
        printk("oss_irq_enable(%d)\n", irq);
 #endif
        switch(irq) {
-               case IRQ_SCC:
-               case IRQ_SCCA:
-               case IRQ_SCCB:
+               case IRQ_MAC_SCC:
                        oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_IOPSCC;
                        break;
                case IRQ_MAC_ADB:
@@ -212,9 +206,7 @@ void oss_irq_disable(int irq) {
        printk("oss_irq_disable(%d)\n", irq);
 #endif
        switch(irq) {
-               case IRQ_SCC:
-               case IRQ_SCCA:
-               case IRQ_SCCB:
+               case IRQ_MAC_SCC:
                        oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_DISABLED;
                        break;
                case IRQ_MAC_ADB:
@@ -250,9 +242,7 @@ void oss_irq_disable(int irq) {
 void oss_irq_clear(int irq) {
        /* FIXME: how to do this on OSS? */
        switch(irq) {
-               case IRQ_SCC:
-               case IRQ_SCCA:
-               case IRQ_SCCB:
+               case IRQ_MAC_SCC:
                        oss->irq_pending &= ~OSS_IP_IOPSCC;
                        break;
                case IRQ_MAC_ADB:
@@ -280,9 +270,7 @@ void oss_irq_clear(int irq) {
 int oss_irq_pending(int irq)
 {
        switch(irq) {
-               case IRQ_SCC:
-               case IRQ_SCCA:
-               case IRQ_SCCB:
+               case IRQ_MAC_SCC:
                        return oss->irq_pending & OSS_IP_IOPSCC;
                        break;
                case IRQ_MAC_ADB: