diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-05-18 15:07:02 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:42 -0800 |
| commit | b4a035f8283dcff56090eea9fcabf7ce6f729ef4 (patch) | |
| tree | f2c8ee160caef57f8845346c17e00fc589a53398 /arch | |
| parent | bced844ea3cd36d6d45af69c8c4b18436c656af4 (diff) | |
ARM: tegra: ventana GPIO keys, regulator power
Rebase-Id: Rcd2e8847135818a4a08515767cb6e050a6acd08e
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-power.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c index 1376b1019ff9..14c5748fc50d 100644 --- a/arch/arm/mach-tegra/board-ventana-power.c +++ b/arch/arm/mach-tegra/board-ventana-power.c @@ -234,7 +234,7 @@ int __init ventana_regulator_init(void) i2c_register_board_info(4, ventana_regulators, 1); - regulator_has_full_constraints(); +// regulator_has_full_constraints(); tegra_init_suspend(&ventana_suspend_data); diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 1ed2a5637b80..5af980559e83 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -248,7 +248,6 @@ static int ventana_wakeup_key(void) static struct gpio_keys_platform_data ventana_keys_platform_data = { .buttons = ventana_keys, .nbuttons = ARRAY_SIZE(ventana_keys), - .wakeup_key = ventana_wakeup_key, }; static struct platform_device ventana_keys_device = { |