patch-2.4.0-test2 linux/arch/m68k/amiga/amiints.c

• Lines: 63
• Date: Mon Jun 19 12:56:08 2000
• Orig file: v2.4.0-test1/linux/arch/m68k/amiga/amiints.c
• Orig date: Tue Feb 1 01:35:43 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/m68k/amiga/amiints.c linux/arch/m68k/amiga/amiints.c
@@ -58,7 +58,7 @@
 /* irq node variables for amiga interrupt sources */
 static irq_node_t *ami_irq_list[AMI_STD_IRQS];
 
-unsigned short ami_intena_vals[AMI_STD_IRQS] = {
+unsigned short amiga_intena_vals[AMI_STD_IRQS] = {
 	IF_VERTB, IF_COPER, IF_AUD0, IF_AUD1, IF_AUD2, IF_AUD3, IF_BLIT,
 	IF_DSKSYN, IF_DSKBLK, IF_RBF, IF_TBE, IF_SOFT, IF_PORTS, IF_EXTER
 };
@@ -230,7 +230,7 @@
 
 	/* enable the interrupt */
 	if (irq < IRQ_AMIGA_PORTS && !ami_ablecount[irq])
-		custom.intena = IF_SETCLR | ami_intena_vals[irq];
+		custom.intena = IF_SETCLR | amiga_intena_vals[irq];
 
 	return error;
 }
@@ -259,7 +259,7 @@
 		amiga_delete_irq(&ami_irq_list[irq], dev_id);
 		/* if server list empty, disable the interrupt */
 		if (!ami_irq_list[irq] && irq < IRQ_AMIGA_PORTS)
-			custom.intena = ami_intena_vals[irq];
+			custom.intena = amiga_intena_vals[irq];
 	} else {
 		if (ami_irq_list[irq]->dev_id != dev_id)
 			printk("%s: removing probably wrong IRQ %d from %s\n",
@@ -268,7 +268,7 @@
 		ami_irq_list[irq]->flags   = 0;
 		ami_irq_list[irq]->dev_id  = NULL;
 		ami_irq_list[irq]->devname = NULL;
-		custom.intena = ami_intena_vals[irq];
+		custom.intena = amiga_intena_vals[irq];
 	}
 }
 
@@ -312,7 +312,7 @@
 	}
 
 	/* enable the interrupt */
-	custom.intena = IF_SETCLR | ami_intena_vals[irq];
+	custom.intena = IF_SETCLR | amiga_intena_vals[irq];
 }
 
 void amiga_disable_irq(unsigned int irq)
@@ -343,7 +343,7 @@
 	}
 
 	/* disable the interrupt */
-	custom.intena = ami_intena_vals[irq];
+	custom.intena = amiga_intena_vals[irq];
 }
 
 inline void amiga_do_irq(int irq, struct pt_regs *fp)
@@ -361,7 +361,7 @@
 	if (server->count++)
 		server->reentrance = 1;
 
-	intena = ami_intena_vals[irq];
+	intena = amiga_intena_vals[irq];
 	custom.intreq = intena;
 
 	/* serve fast handler if present - there can only be one of these */