diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
| commit | 664cee46e755b37204f1731cb8726db610f3486d (patch) | |
| tree | 11ed0d43eff14123534785cf25c0a2143e134e7e /arch/arm/mach-ixp2000/ixdp2x01.c | |
| parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
| parent | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x01.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 34b1b2af37c8..84835b209557 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
| @@ -115,8 +115,8 @@ void __init ixdp2x01_init_irq(void) | |||
| 115 | 115 | ||
| 116 | for (irq = NR_IXP2000_IRQS; irq < NR_IXDP2X01_IRQS; irq++) { | 116 | for (irq = NR_IXP2000_IRQS; irq < NR_IXDP2X01_IRQS; irq++) { |
| 117 | if (irq & valid_irq_mask) { | 117 | if (irq & valid_irq_mask) { |
| 118 | set_irq_chip(irq, &ixdp2x01_irq_chip); | 118 | irq_set_chip_and_handler(irq, &ixdp2x01_irq_chip, |
| 119 | set_irq_handler(irq, handle_level_irq); | 119 | handle_level_irq); |
| 120 | set_irq_flags(irq, IRQF_VALID); | 120 | set_irq_flags(irq, IRQF_VALID); |
| 121 | } else { | 121 | } else { |
| 122 | set_irq_flags(irq, 0); | 122 | set_irq_flags(irq, 0); |
| @@ -124,7 +124,7 @@ void __init ixdp2x01_init_irq(void) | |||
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | /* Hook into PCI interrupts */ | 126 | /* Hook into PCI interrupts */ |
| 127 | set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler); | 127 | irq_set_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | 130 | ||