diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 05:49:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 05:49:26 +0300 |
| commit | ef9f2fa17f3d6973a479a7677a023ee3604a52cb (patch) | |
| tree | 6d4883210974774a4478f32f1306f0467717bb6f /arch/arm/mach-tegra/gpio.c | |
| parent | 1f0324caefd39985e9fe052fac97da31694db31e (diff) | |
| parent | b48b5f51568977592f1bfce91c1c6378b0a5a4f5 (diff) | |
| download | linux-ef9f2fa17f3d6973a479a7677a023ee3604a52cb.tar.xz | |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
ARM: tegra: clock: Add forward reference to struct clk
ARM: tegra: irq: Rename gic pointers to avoid conflicts
arm/tegra: Fix tegra irq_data conversion
Diffstat (limited to 'arch/arm/mach-tegra/gpio.c')
| -rw-r--r-- | arch/arm/mach-tegra/gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c index bd066206e110..ad8048801513 100644 --- a/arch/arm/mach-tegra/gpio.c +++ b/arch/arm/mach-tegra/gpio.c @@ -207,9 +207,9 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type) spin_unlock_irqrestore(&bank->lvl_lock[port], flags); if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) - __set_irq_handler_unlocked(irq, handle_level_irq); + __set_irq_handler_unlocked(d->irq, handle_level_irq); else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING)) - __set_irq_handler_unlocked(irq, handle_edge_irq); + __set_irq_handler_unlocked(d->irq, handle_edge_irq); return 0; } |