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-shark/irq.c | |
| parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
| parent | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff) | |
| download | kernel_samsung_aries-664cee46e755b37204f1731cb8726db610f3486d.zip kernel_samsung_aries-664cee46e755b37204f1731cb8726db610f3486d.tar.gz kernel_samsung_aries-664cee46e755b37204f1731cb8726db610f3486d.tar.bz2 | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-shark/irq.c')
| -rw-r--r-- | arch/arm/mach-shark/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c index 831fc66..5dce13e 100644 --- a/arch/arm/mach-shark/irq.c +++ b/arch/arm/mach-shark/irq.c @@ -80,8 +80,7 @@ void __init shark_init_irq(void) int irq; for (irq = 0; irq < NR_IRQS; irq++) { - set_irq_chip(irq, &fb_chip); - set_irq_handler(irq, handle_edge_irq); + irq_set_chip_and_handler(irq, &fb_chip, handle_edge_irq); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } |