diff options
Diffstat (limited to 'arch/parisc/kernel/irq.c')
-rw-r--r-- | arch/parisc/kernel/irq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 197936d9359a..26e69f73fdb0 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
@@ -158,7 +158,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
158 | seq_printf(p, "%10u ", kstat_irqs(i)); | 158 | seq_printf(p, "%10u ", kstat_irqs(i)); |
159 | #endif | 159 | #endif |
160 | 160 | ||
161 | seq_printf(p, " %14s", irq_desc[i].handler->typename); | 161 | seq_printf(p, " %14s", irq_desc[i].chip->typename); |
162 | #ifndef PARISC_IRQ_CR16_COUNTS | 162 | #ifndef PARISC_IRQ_CR16_COUNTS |
163 | seq_printf(p, " %s", action->name); | 163 | seq_printf(p, " %s", action->name); |
164 | 164 | ||
@@ -210,12 +210,12 @@ int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *type, void *data) | |||
210 | { | 210 | { |
211 | if (irq_desc[irq].action) | 211 | if (irq_desc[irq].action) |
212 | return -EBUSY; | 212 | return -EBUSY; |
213 | if (irq_desc[irq].handler != &cpu_interrupt_type) | 213 | if (irq_desc[irq].chip != &cpu_interrupt_type) |
214 | return -EBUSY; | 214 | return -EBUSY; |
215 | 215 | ||
216 | if (type) { | 216 | if (type) { |
217 | irq_desc[irq].handler = type; | 217 | irq_desc[irq].chip = type; |
218 | irq_desc[irq].handler_data = data; | 218 | irq_desc[irq].chip_data = data; |
219 | cpu_interrupt_type.enable(irq); | 219 | cpu_interrupt_type.enable(irq); |
220 | } | 220 | } |
221 | return 0; | 221 | return 0; |
@@ -378,7 +378,7 @@ static void claim_cpu_irqs(void) | |||
378 | { | 378 | { |
379 | int i; | 379 | int i; |
380 | for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) { | 380 | for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) { |
381 | irq_desc[i].handler = &cpu_interrupt_type; | 381 | irq_desc[i].chip = &cpu_interrupt_type; |
382 | } | 382 | } |
383 | 383 | ||
384 | irq_desc[TIMER_IRQ].action = &timer_action; | 384 | irq_desc[TIMER_IRQ].action = &timer_action; |