diff options
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-int.c')
-rw-r--r-- | arch/mips/sgi-ip22/ip22-int.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index 2d8762818d95..f66026e5d64b 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
@@ -74,7 +74,7 @@ static void end_local0_irq (unsigned int irq) | |||
74 | enable_local0_irq(irq); | 74 | enable_local0_irq(irq); |
75 | } | 75 | } |
76 | 76 | ||
77 | static struct hw_interrupt_type ip22_local0_irq_type = { | 77 | static struct irq_chip ip22_local0_irq_type = { |
78 | .typename = "IP22 local 0", | 78 | .typename = "IP22 local 0", |
79 | .startup = startup_local0_irq, | 79 | .startup = startup_local0_irq, |
80 | .shutdown = shutdown_local0_irq, | 80 | .shutdown = shutdown_local0_irq, |
@@ -120,7 +120,7 @@ static void end_local1_irq (unsigned int irq) | |||
120 | enable_local1_irq(irq); | 120 | enable_local1_irq(irq); |
121 | } | 121 | } |
122 | 122 | ||
123 | static struct hw_interrupt_type ip22_local1_irq_type = { | 123 | static struct irq_chip ip22_local1_irq_type = { |
124 | .typename = "IP22 local 1", | 124 | .typename = "IP22 local 1", |
125 | .startup = startup_local1_irq, | 125 | .startup = startup_local1_irq, |
126 | .shutdown = shutdown_local1_irq, | 126 | .shutdown = shutdown_local1_irq, |
@@ -166,7 +166,7 @@ static void end_local2_irq (unsigned int irq) | |||
166 | enable_local2_irq(irq); | 166 | enable_local2_irq(irq); |
167 | } | 167 | } |
168 | 168 | ||
169 | static struct hw_interrupt_type ip22_local2_irq_type = { | 169 | static struct irq_chip ip22_local2_irq_type = { |
170 | .typename = "IP22 local 2", | 170 | .typename = "IP22 local 2", |
171 | .startup = startup_local2_irq, | 171 | .startup = startup_local2_irq, |
172 | .shutdown = shutdown_local2_irq, | 172 | .shutdown = shutdown_local2_irq, |
@@ -212,7 +212,7 @@ static void end_local3_irq (unsigned int irq) | |||
212 | enable_local3_irq(irq); | 212 | enable_local3_irq(irq); |
213 | } | 213 | } |
214 | 214 | ||
215 | static struct hw_interrupt_type ip22_local3_irq_type = { | 215 | static struct irq_chip ip22_local3_irq_type = { |
216 | .typename = "IP22 local 3", | 216 | .typename = "IP22 local 3", |
217 | .startup = startup_local3_irq, | 217 | .startup = startup_local3_irq, |
218 | .shutdown = shutdown_local3_irq, | 218 | .shutdown = shutdown_local3_irq, |
@@ -421,7 +421,7 @@ void __init arch_init_irq(void) | |||
421 | mips_cpu_irq_init(SGINT_CPU); | 421 | mips_cpu_irq_init(SGINT_CPU); |
422 | 422 | ||
423 | for (i = SGINT_LOCAL0; i < SGI_INTERRUPTS; i++) { | 423 | for (i = SGINT_LOCAL0; i < SGI_INTERRUPTS; i++) { |
424 | hw_irq_controller *handler; | 424 | struct irq_chip *handler; |
425 | 425 | ||
426 | if (i < SGINT_LOCAL1) | 426 | if (i < SGINT_LOCAL1) |
427 | handler = &ip22_local0_irq_type; | 427 | handler = &ip22_local0_irq_type; |