diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 14:37:22 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 14:37:22 -0600 |
| commit | b6336ca2982ccac98d9d017426c53ff1e13c017f (patch) | |
| tree | 26d7c5b1999cab1db6d2178d37a366a10a22ba7f /arch/arm/mach-tegra/board-harmony.h | |
| parent | a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 (diff) | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
Merge remote-tracking branch 'origin' into spi/merge
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.h')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.h b/arch/arm/mach-tegra/board-harmony.h index 1e57b071f52d..d85142edaf6b 100644 --- a/arch/arm/mach-tegra/board-harmony.h +++ b/arch/arm/mach-tegra/board-harmony.h @@ -17,7 +17,8 @@ #ifndef _MACH_TEGRA_BOARD_HARMONY_H #define _MACH_TEGRA_BOARD_HARMONY_H -#define HARMONY_GPIO_WM8903(_x_) (TEGRA_NR_GPIOS + (_x_)) +#define HARMONY_GPIO_TPS6586X(_x_) (TEGRA_NR_GPIOS + (_x_)) +#define HARMONY_GPIO_WM8903(_x_) (HARMONY_GPIO_TPS6586X(4) + (_x_)) #define TEGRA_GPIO_SD2_CD TEGRA_GPIO_PI5 #define TEGRA_GPIO_SD2_WP TEGRA_GPIO_PH1 |