X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fsgi-ip22%2Fip22-eisa.c;fp=arch%2Fmips%2Fsgi-ip22%2Fip22-eisa.c;h=b19820110aa3a91c52c9bf1f0157b3979001a315;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=ee0514a2992278f80aaf03012ca8f8bc2663c169;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c
index ee0514a29..b19820110 100644
--- a/arch/mips/sgi-ip22/ip22-eisa.c
+++ b/arch/mips/sgi-ip22/ip22-eisa.c
@@ -19,6 +19,7 @@
  * - Fix more bugs.
  */
 
+#include <linux/config.h>
 #include <linux/eisa.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -144,7 +145,7 @@ static void end_eisa1_irq(unsigned int irq)
 		enable_eisa1_irq(irq);
 }
 
-static struct irq_chip ip22_eisa1_irq_type = {
+static struct hw_interrupt_type ip22_eisa1_irq_type = {
 	.typename	= "IP22 EISA",
 	.startup	= startup_eisa1_irq,
 	.shutdown	= shutdown_eisa1_irq,
@@ -206,7 +207,7 @@ static void end_eisa2_irq(unsigned int irq)
 		enable_eisa2_irq(irq);
 }
 
-static struct irq_chip ip22_eisa2_irq_type = {
+static struct hw_interrupt_type ip22_eisa2_irq_type = {
 	.typename	= "IP22 EISA",
 	.startup	= startup_eisa2_irq,
 	.shutdown	= shutdown_eisa2_irq,
@@ -278,9 +279,9 @@ int __init ip22_eisa_init(void)
 		irq_desc[i].action = 0;
 		irq_desc[i].depth = 1;
 		if (i < (SGINT_EISA + 8))
-			irq_desc[i].chip = &ip22_eisa1_irq_type;
+			irq_desc[i].handler = &ip22_eisa1_irq_type;
 		else
-			irq_desc[i].chip = &ip22_eisa2_irq_type;
+			irq_desc[i].handler = &ip22_eisa2_irq_type;
 	}
 
 	/* Cannot use request_irq because of kmalloc not being ready at such