diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 20:19:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 20:19:17 -0700 |
| commit | e82e6f16a809bc47eb929c3408921def28638fcd (patch) | |
| tree | e211abc7646e5a39a67b1d235a08bfd9136f68ca /arch/arm/mach-tegra/gpio.c | |
| parent | c98ece69fecf246b9e168f4ddd7d90de4027b298 (diff) | |
| parent | 906c3b616dcf8e64b11d7d665d62f5e9940f4d46 (diff) | |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
arm: tegra: fix error check in tegra2_clocks.c
ARM: tegra: gpio: Fix unused variable warnings
Diffstat (limited to 'arch/arm/mach-tegra/gpio.c')
| -rw-r--r-- | arch/arm/mach-tegra/gpio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c index 76a3f654220f..65a1aba6823d 100644 --- a/arch/arm/mach-tegra/gpio.c +++ b/arch/arm/mach-tegra/gpio.c @@ -257,7 +257,8 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) void tegra_gpio_resume(void) { unsigned long flags; - int b, p, i; + int b; + int p; local_irq_save(flags); @@ -280,7 +281,8 @@ void tegra_gpio_resume(void) void tegra_gpio_suspend(void) { unsigned long flags; - int b, p, i; + int b; + int p; local_irq_save(flags); for (b = 0; b < ARRAY_SIZE(tegra_gpio_banks); b++) { |