diff options
| author | James Morris | 2009-03-24 00:52:46 +0100 |
|---|---|---|
| committer | James Morris | 2009-03-24 00:52:46 +0100 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /arch/arm/mach-orion5x/irq.c | |
| parent | SELinux: inode_doinit_with_dentry drop no dentry printk (diff) | |
| parent | Linux 2.6.29 (diff) | |
| download | kernel-qcow2-linux-703a3cd72817e99201cef84a8a7aecc60b2b3581.tar.gz kernel-qcow2-linux-703a3cd72817e99201cef84a8a7aecc60b2b3581.tar.xz kernel-qcow2-linux-703a3cd72817e99201cef84a8a7aecc60b2b3581.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-orion5x/irq.c')
| -rw-r--r-- | arch/arm/mach-orion5x/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c index 0caae43301e5..e03f7b45cb0d 100644 --- a/arch/arm/mach-orion5x/irq.c +++ b/arch/arm/mach-orion5x/irq.c @@ -44,7 +44,7 @@ void __init orion5x_init_irq(void) * User can use set_type() if he wants to use edge types handlers. */ for (i = IRQ_ORION5X_GPIO_START; i < NR_IRQS; i++) { - set_irq_chip(i, &orion_gpio_irq_level_chip); + set_irq_chip(i, &orion_gpio_irq_chip); set_irq_handler(i, handle_level_irq); irq_desc[i].status |= IRQ_LEVEL; set_irq_flags(i, IRQF_VALID); |