diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 07:12:41 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 07:12:41 (GMT) |
commit | 09f68072b32089f2e3b4749161eb3ce954faf8d4 (patch) | |
tree | b8b3c84f8a9c7150c2d830428daa3d641917ecf3 /arch/arm/mach-netx | |
parent | d454f39f3ff3ee5a818c271026081a48a537bd41 (diff) | |
parent | ef49e4fae3f364af8da041dcc1bb4931c749b3da (diff) | |
download | linux-09f68072b32089f2e3b4749161eb3ce954faf8d4.tar.xz |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'arch/arm/mach-netx')
-rw-r--r-- | arch/arm/mach-netx/generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 29ffa75..00023b5 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -171,13 +171,13 @@ void __init netx_init_irq(void) vic_init(__io(io_p2v(NETX_PA_VIC)), 0, ~0, 0); for (irq = NETX_IRQ_HIF_CHAINED(0); irq <= NETX_IRQ_HIF_LAST; irq++) { - set_irq_chip(irq, &netx_hif_chip); - set_irq_handler(irq, handle_level_irq); + irq_set_chip_and_handler(irq, &netx_hif_chip, + handle_level_irq); set_irq_flags(irq, IRQF_VALID); } writel(NETX_DPMAS_INT_EN_GLB_EN, NETX_DPMAS_INT_EN); - set_irq_chained_handler(NETX_IRQ_HIF, netx_hif_demux_handler); + irq_set_chained_handler(NETX_IRQ_HIF, netx_hif_demux_handler); } static int __init netx_init(void) |