diff options
Diffstat (limited to 'arch/arm/mach-ixp23xx/core.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index f2039722bace..a1bee33d183e 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
| @@ -289,12 +289,12 @@ static void ixp23xx_config_irq(unsigned int irq, enum ixp23xx_irq_type type) | |||
| 289 | { | 289 | { |
| 290 | switch (type) { | 290 | switch (type) { |
| 291 | case IXP23XX_IRQ_LEVEL: | 291 | case IXP23XX_IRQ_LEVEL: |
| 292 | irq_set_chip(irq, &ixp23xx_irq_level_chip); | 292 | irq_set_chip_and_handler(irq, &ixp23xx_irq_level_chip, |
| 293 | irq_set_handler(irq, handle_level_irq); | 293 | handle_level_irq); |
| 294 | break; | 294 | break; |
| 295 | case IXP23XX_IRQ_EDGE: | 295 | case IXP23XX_IRQ_EDGE: |
| 296 | irq_set_chip(irq, &ixp23xx_irq_edge_chip); | 296 | irq_set_chip_and_handler(irq, &ixp23xx_irq_edge_chip, |
| 297 | irq_set_handler(irq, handle_edge_irq); | 297 | handle_edge_irq); |
| 298 | break; | 298 | break; |
| 299 | } | 299 | } |
| 300 | set_irq_flags(irq, IRQF_VALID); | 300 | set_irq_flags(irq, IRQF_VALID); |
| @@ -324,8 +324,8 @@ void __init ixp23xx_init_irq(void) | |||
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | for (irq = IRQ_IXP23XX_INTA; irq <= IRQ_IXP23XX_INTB; irq++) { | 326 | for (irq = IRQ_IXP23XX_INTA; irq <= IRQ_IXP23XX_INTB; irq++) { |
| 327 | irq_set_chip(irq, &ixp23xx_pci_irq_chip); | 327 | irq_set_chip_and_handler(irq, &ixp23xx_pci_irq_chip, |
| 328 | irq_set_handler(irq, handle_level_irq); | 328 | handle_level_irq); |
| 329 | set_irq_flags(irq, IRQF_VALID); | 329 | set_irq_flags(irq, IRQF_VALID); |
| 330 | } | 330 | } |
| 331 | 331 | ||