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-power.c | |
| parent | a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 (diff) | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
Merge remote-tracking branch 'origin' into spi/merge
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony-power.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index c84442cabe07..5ad8b2f94f8d 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c @@ -24,6 +24,8 @@ #include <mach/irqs.h> +#include "board-harmony.h" + #define PMC_CTRL 0x0 #define PMC_CTRL_INTR_LOW (1 << 17) @@ -98,7 +100,7 @@ static struct tps6586x_platform_data tps_platform = { .irq_base = TEGRA_NR_IRQS, .num_subdevs = ARRAY_SIZE(tps_devs), .subdevs = tps_devs, - .gpio_base = TEGRA_NR_GPIOS, + .gpio_base = HARMONY_GPIO_TPS6586X(0), }; static struct i2c_board_info __initdata harmony_regulators[] = { |