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-pxa/lpd270.c | |
| 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-pxa/lpd270.c')
| -rw-r--r-- | arch/arm/mach-pxa/lpd270.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index c9a3e77..6307f70 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c @@ -149,12 +149,12 @@ static void __init lpd270_init_irq(void) /* setup extra LogicPD PXA270 irqs */ for (irq = LPD270_IRQ(2); irq <= LPD270_IRQ(4); irq++) { - set_irq_chip(irq, &lpd270_irq_chip); - set_irq_handler(irq, handle_level_irq); + irq_set_chip_and_handler(irq, &lpd270_irq_chip, + handle_level_irq); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } - set_irq_chained_handler(IRQ_GPIO(0), lpd270_irq_handler); - set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); + irq_set_chained_handler(IRQ_GPIO(0), lpd270_irq_handler); + irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING); } |