X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-shark%2Firq.c;h=00a6c14668673f4158e77c01690f8fa8af0d16c2;hb=refs%2Fheads%2Fvserver;hp=fb8e6b3c5838bf194a70455ad26f3eb2c3fbeffd;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c
index fb8e6b3c5..00a6c1466 100644
--- a/arch/arm/mach-shark/irq.c
+++ b/arch/arm/mach-shark/irq.c
@@ -61,14 +61,16 @@ static void shark_enable_8259A_irq(unsigned int irq)
 
 static void shark_ack_8259A_irq(unsigned int irq){}
 
-static void bogus_int(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t bogus_int(int irq, void *dev_id)
 {
 	printk("Got interrupt %i!\n",irq);
+	return IRQ_NONE;
 }
 
 static struct irqaction cascade;
 
-static struct irqchip fb_chip = {
+static struct irq_chip fb_chip = {
+	.name	= "XT-PIC",
 	.ack	= shark_ack_8259A_irq,
 	.mask	= shark_disable_8259A_irq,
 	.unmask = shark_enable_8259A_irq,
@@ -80,7 +82,7 @@ void __init shark_init_irq(void)
 
 	for (irq = 0; irq < NR_IRQS; irq++) {
 		set_irq_chip(irq, &fb_chip);
-		set_irq_handler(irq, do_edge_IRQ);
+		set_irq_handler(irq, handle_edge_irq);
 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
 	}
 
@@ -102,11 +104,7 @@ void __init shark_init_irq(void)
 	//request_region(0xA0,0x2,"pic2");
 
 	cascade.handler = bogus_int;
-	cascade.flags = 0;
-	cascade.mask = 0;
 	cascade.name = "cascade";
-	cascade.next = NULL;
-	cascade.dev_id = NULL;
 	setup_irq(2,&cascade);
 }