diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 10:05:30 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 10:05:30 +0200 |
commit | 664cee46e755b37204f1731cb8726db610f3486d (patch) | |
tree | 11ed0d43eff14123534785cf25c0a2143e134e7e /arch/arm/mach-nuc93x/irq.c | |
parent | Merge branch 'fix/asoc' into for-linus (diff) | |
parent | Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
download | linux-664cee46e755b37204f1731cb8726db610f3486d.tar.xz linux-664cee46e755b37204f1731cb8726db610f3486d.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-nuc93x/irq.c')
-rw-r--r-- | arch/arm/mach-nuc93x/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-nuc93x/irq.c b/arch/arm/mach-nuc93x/irq.c index 1f8a05a22834..aa279f23e342 100644 --- a/arch/arm/mach-nuc93x/irq.c +++ b/arch/arm/mach-nuc93x/irq.c @@ -59,8 +59,8 @@ void __init nuc93x_init_irq(void) __raw_writel(0xFFFFFFFE, REG_AIC_MDCR); for (irqno = IRQ_WDT; irqno <= NR_IRQS; irqno++) { - set_irq_chip(irqno, &nuc93x_irq_chip); - set_irq_handler(irqno, handle_level_irq); + irq_set_chip_and_handler(irqno, &nuc93x_irq_chip, + handle_level_irq); set_irq_flags(irqno, IRQF_VALID); } } |