diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2013-01-30 10:50:57 +0200 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-02-07 16:40:30 -0800 |
| commit | 6c4afd629df226c4152740f6e3d77f6120d3c13e (patch) | |
| tree | 1e7e6b163628d2fc72577e9a95b4262a1369b53f /arch/arm/mach-tegra | |
| parent | 9f6f9a18c28e31482e350866878a4ac8adc2a627 (diff) | |
EDP: renaming imax to max
The edp_manager structure's imax member is renamed to max so that it is
not tied to any specific units.
Change-Id: I01f538ec17d3f04d8ad3e7e904e2ba8b4cc0c339
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
(cherry picked from commit 2b4e001b7303ab4c614d8cbc6fe5d1acb98244e6)
(Conflicts resolved manually)
Reviewed-on: http://git-master/r/196356
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-macallan.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-pluto.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore.c b/arch/arm/mach-tegra/board-dalmore.c index c4de4f38fe73..7b3017a7b92d 100644 --- a/arch/arm/mach-tegra/board-dalmore.c +++ b/arch/arm/mach-tegra/board-dalmore.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-dalmore.c * - * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -784,7 +784,7 @@ static int __init dalmore_touch_init(void) #ifdef CONFIG_EDP_FRAMEWORK static struct edp_manager battery_edp_manager = { .name = "battery", - .imax = 2500 + .max = 2500 }; static void __init dalmore_battery_edp_init(void) diff --git a/arch/arm/mach-tegra/board-macallan.c b/arch/arm/mach-tegra/board-macallan.c index 04de511da6af..0b63e8595063 100644 --- a/arch/arm/mach-tegra/board-macallan.c +++ b/arch/arm/mach-tegra/board-macallan.c @@ -704,7 +704,7 @@ static int __init macallan_touch_init(void) #ifdef CONFIG_EDP_FRAMEWORK static struct edp_manager battery_edp_manager = { .name = "battery", - .imax = 2500 + .max = 2500 }; static void __init macallan_battery_edp_init(void) diff --git a/arch/arm/mach-tegra/board-pluto.c b/arch/arm/mach-tegra/board-pluto.c index d194b2e7e14a..c240be1025a4 100644 --- a/arch/arm/mach-tegra/board-pluto.c +++ b/arch/arm/mach-tegra/board-pluto.c @@ -1175,7 +1175,7 @@ static int __init pluto_touch_init(void) #ifdef CONFIG_EDP_FRAMEWORK static struct edp_manager battery_edp_manager = { .name = "battery", - .imax = 3250 + .max = 3250 }; static void __init pluto_battery_edp_init(void) |