diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:57:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:57:14 +0100 |
| commit | 099b4d3b473db012a55ce6bec9ef594d0508e782 (patch) | |
| tree | a55980b995612c188d02bd6f47b93f1e17733572 /arch/arm/mach-tegra/board-harmony.h | |
| parent | 09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd (diff) | |
| parent | 7e9f1945213cdd7cd11f29346ded07a81854b5af (diff) | |
Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into fixes
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 1e57b071f52..d85142edaf6 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 |