diff options
Diffstat (limited to 'arch/m68k/amiga/cia.c')
-rw-r--r-- | arch/m68k/amiga/cia.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c index b04b453718d9..84663ae824ef 100644 --- a/arch/m68k/amiga/cia.c +++ b/arch/m68k/amiga/cia.c | |||
@@ -168,14 +168,16 @@ static struct irq_chip auto_irq_chip = { | |||
168 | 168 | ||
169 | void __init cia_init_IRQ(struct ciabase *base) | 169 | void __init cia_init_IRQ(struct ciabase *base) |
170 | { | 170 | { |
171 | m68k_setup_irq_chip(&cia_irq_chip, base->cia_irq, CIA_IRQS); | 171 | m68k_setup_irq_controller(&cia_irq_chip, handle_simple_irq, |
172 | base->cia_irq, CIA_IRQS); | ||
172 | 173 | ||
173 | /* clear any pending interrupt and turn off all interrupts */ | 174 | /* clear any pending interrupt and turn off all interrupts */ |
174 | cia_set_irq(base, CIA_ICR_ALL); | 175 | cia_set_irq(base, CIA_ICR_ALL); |
175 | cia_able_irq(base, CIA_ICR_ALL); | 176 | cia_able_irq(base, CIA_ICR_ALL); |
176 | 177 | ||
177 | /* override auto int and install CIA handler */ | 178 | /* override auto int and install CIA handler */ |
178 | m68k_setup_irq_chip(&auto_irq_chip, base->handler_irq, 1); | 179 | m68k_setup_irq_controller(&auto_irq_chip, handle_simple_irq, |
180 | base->handler_irq, 1); | ||
179 | m68k_irq_startup_irq(base->handler_irq); | 181 | m68k_irq_startup_irq(base->handler_irq); |
180 | if (request_irq(base->handler_irq, cia_handler, IRQF_SHARED, | 182 | if (request_irq(base->handler_irq, cia_handler, IRQF_SHARED, |
181 | base->name, base)) | 183 | base->name, base)) |