diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 18:42:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 18:42:06 -0700 |
| commit | b18cae4224bde7e5a332c19bc99247b2098ea232 (patch) | |
| tree | 2ffa750e6a043a1dcfccd71588b7d6cfdcad440a /arch/arm/mach-tegra/include/mach/gpio.h | |
| parent | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (diff) | |
| parent | f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0 (diff) | |
| download | linux-b18cae4224bde7e5a332c19bc99247b2098ea232.tar.gz linux-b18cae4224bde7e5a332c19bc99247b2098ea232.tar.bz2 linux-b18cae4224bde7e5a332c19bc99247b2098ea232.zip | |
Merge branch 'for-next' of git://android.git.kernel.org/kernel/tegra
* 'for-next' of git://android.git.kernel.org/kernel/tegra:
spi: tegra: fix error setting on timeout
spi: add spi_tegra driver
tegra: harmony: enable PCI Express
tegra: add PCI Express support
tegra: add PCI Express clocks
[ARM] tegra: Add APB DMA support
[ARM] tegra: Add cpufreq support
[ARM] tegra: common: Update common clock init table
[ARM] tegra: clock: Add dvfs support, bug fixes, and cleanups
[ARM] tegra: Add support for reading fuses
[ARM] tegra: gpio: Add suspend and wake support
[ARM] tegra: pinmux: add safe values, move tegra2, add suspend
[ARM] tegra: add suspend and mirror irqs to legacy controller
[ARM] tegra: Add legacy irq support
[ARM] tegra: update iomap
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/gpio.h')
| -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; } |