patch-2.4.0-test12 linux/arch/m68k/amiga/cia.c

• Lines: 30
• Date: Mon Nov 27 17:57:34 2000
• Orig file: v2.4.0-test11/linux/arch/m68k/amiga/cia.c
• Orig date: Sun Aug 15 11:47:29 1999

diff -u --recursive --new-file v2.4.0-test11/linux/arch/m68k/amiga/cia.c linux/arch/m68k/amiga/cia.c
@@ -27,18 +27,17 @@
 	u_short int_mask;
 	int handler_irq, cia_irq, server_irq;
 	char *name;
-	struct irq_server server;
 	irq_handler_t irq_list[CIA_IRQS];
 } ciaa_base = {
 	&ciaa, 0, 0, IF_PORTS,
 	IRQ_AMIGA_AUTO_2, IRQ_AMIGA_CIAA,
 	IRQ_AMIGA_PORTS,
-	"CIAA handler", {0, 0}
+	"CIAA handler"
 }, ciab_base = {
 	&ciab, 0, 0, IF_EXTER,
 	IRQ_AMIGA_AUTO_6, IRQ_AMIGA_CIAB,
 	IRQ_AMIGA_EXTER,
-	"CIAB handler", {0, 0}
+	"CIAB handler"
 };
 
 /*
@@ -136,7 +135,7 @@
 		}
 		ints >>= 1;
 	}
-	amiga_do_irq_list(base->server_irq, fp, &base->server);
+	amiga_do_irq_list(base->server_irq, fp);
 }
 
 void __init cia_init_IRQ(struct ciabase *base)