diff options
Diffstat (limited to 'arch/mips/sibyte/bcm1480/irq.c')
-rw-r--r-- | arch/mips/sibyte/bcm1480/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 29d3bbb5847d..2c5afb4c2ef3 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
@@ -83,7 +83,7 @@ extern char sb1250_duart_present[]; | |||
83 | #endif | 83 | #endif |
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | static struct hw_interrupt_type bcm1480_irq_type = { | 86 | static struct irq_chip bcm1480_irq_type = { |
87 | .typename = "BCM1480-IMR", | 87 | .typename = "BCM1480-IMR", |
88 | .startup = startup_bcm1480_irq, | 88 | .startup = startup_bcm1480_irq, |
89 | .shutdown = shutdown_bcm1480_irq, | 89 | .shutdown = shutdown_bcm1480_irq, |
@@ -140,7 +140,7 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask) | |||
140 | { | 140 | { |
141 | int i = 0, old_cpu, cpu, int_on, k; | 141 | int i = 0, old_cpu, cpu, int_on, k; |
142 | u64 cur_ints; | 142 | u64 cur_ints; |
143 | irq_desc_t *desc = irq_desc + irq; | 143 | struct irq_desc *desc = irq_desc + irq; |
144 | unsigned long flags; | 144 | unsigned long flags; |
145 | unsigned int irq_dirty; | 145 | unsigned int irq_dirty; |
146 | 146 | ||
@@ -278,7 +278,7 @@ void __init init_bcm1480_irqs(void) | |||
278 | irq_desc[i].chip = &bcm1480_irq_type; | 278 | irq_desc[i].chip = &bcm1480_irq_type; |
279 | bcm1480_irq_owner[i] = 0; | 279 | bcm1480_irq_owner[i] = 0; |
280 | } else { | 280 | } else { |
281 | irq_desc[i].chip = &no_irq_type; | 281 | irq_desc[i].chip = &no_irq_chip; |
282 | } | 282 | } |
283 | } | 283 | } |
284 | } | 284 | } |
@@ -301,7 +301,7 @@ static struct irqaction bcm1480_dummy_action = { | |||
301 | 301 | ||
302 | int bcm1480_steal_irq(int irq) | 302 | int bcm1480_steal_irq(int irq) |
303 | { | 303 | { |
304 | irq_desc_t *desc = irq_desc + irq; | 304 | struct irq_desc *desc = irq_desc + irq; |
305 | unsigned long flags; | 305 | unsigned long flags; |
306 | int retval = 0; | 306 | int retval = 0; |
307 | 307 | ||