X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fkernel%2Firq-rm9000.c;fp=arch%2Fmips%2Fkernel%2Firq-rm9000.c;h=9b5f20c32acb97177b946fdb1c1a863c1a03cd1b;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=62f011ba97a25de7832ef6631ccfdac6423b0add;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index 62f011ba9..9b5f20c32 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -105,7 +105,7 @@ static void rm9k_cpu_irq_end(unsigned int irq)
 		unmask_rm9k_irq(irq);
 }
 
-static struct irq_chip rm9k_irq_controller = {
+static hw_irq_controller rm9k_irq_controller = {
 	.typename = "RM9000",
 	.startup = rm9k_cpu_irq_startup,
 	.shutdown = rm9k_cpu_irq_shutdown,
@@ -115,7 +115,7 @@ static struct irq_chip rm9k_irq_controller = {
 	.end = rm9k_cpu_irq_end,
 };
 
-static struct irq_chip rm9k_perfcounter_irq = {
+static hw_irq_controller rm9k_perfcounter_irq = {
 	.typename = "RM9000",
 	.startup = rm9k_perfcounter_irq_startup,
 	.shutdown = rm9k_perfcounter_irq_shutdown,
@@ -139,11 +139,11 @@ void __init rm9k_cpu_irq_init(int base)
 		irq_desc[i].status = IRQ_DISABLED;
 		irq_desc[i].action = NULL;
 		irq_desc[i].depth = 1;
-		irq_desc[i].chip = &rm9k_irq_controller;
+		irq_desc[i].handler = &rm9k_irq_controller;
 	}
 
 	rm9000_perfcount_irq = base + 1;
-	irq_desc[rm9000_perfcount_irq].chip = &rm9k_perfcounter_irq;
+	irq_desc[rm9000_perfcount_irq].handler = &rm9k_perfcounter_irq;
 
 	irq_base = base;
 }