diff options
| author | Colin Cross <ccross@android.com> | 2010-04-07 21:59:42 +0200 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-22 03:12:01 +0200 |
| commit | 2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9 (patch) | |
| tree | ff11a2b600719061af20973ff974ecdcfaccc954 /arch/arm/mach-tegra/include | |
| parent | [ARM] tegra: pinmux: add safe values, move tegra2, add suspend (diff) | |
| download | linux-2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9.tar.xz linux-2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9.zip | |
[ARM] tegra: gpio: Add suspend and wake support
Includes checkpatch fixes and TEGRA_NR_GPIOS changes from
Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-tegra/include')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h index 540e822e50f7..e31f486d69a2 100644 --- a/arch/arm/mach-tegra/include/mach/gpio.h +++ b/arch/arm/mach-tegra/include/mach/gpio.h @@ -22,7 +22,7 @@ #include <mach/irqs.h> -#define ARCH_NR_GPIOS INT_GPIO_NR +#define TEGRA_NR_GPIOS INT_GPIO_NR #include <asm-generic/gpio.h> @@ -35,7 +35,7 @@ static inline int gpio_to_irq(unsigned int gpio) { - if (gpio < ARCH_NR_GPIOS) + if (gpio < TEGRA_NR_GPIOS) return INT_GPIO_BASE + gpio; return -EINVAL; } |