diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
| commit | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch) | |
| tree | 0b8ed22d46d775f04d441e8c480c12ec297a005b /arch/arm/mach-orion5x | |
| parent | tracing/function-graph-tracer: fix merge (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.xz linux-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip | |
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'arch/arm/mach-orion5x')
| -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); |