aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/include/mach/gpio.h
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-04-07 12:59:42 -0700
committerColin Cross <ccross@android.com>2010-10-21 18:12:01 -0700
commit2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9 (patch)
treeff11a2b600719061af20973ff974ecdcfaccc954 /arch/arm/mach-tegra/include/mach/gpio.h
parentc5f04b8d10a73f2a016d6815d64dd5eebc734097 (diff)
downloadkernel_samsung_smdk4412-2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9.zip
kernel_samsung_smdk4412-2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9.tar.gz
kernel_samsung_smdk4412-2e47b8b3c2dc0f9f0651ee0f20e163da09b20fb9.tar.bz2
[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/mach/gpio.h')
-rw-r--r--arch/arm/mach-tegra/include/mach/gpio.h4
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 540e822..e31f486 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;
}