diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-06-05 11:41:56 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-06-05 11:41:56 -0700 |
| commit | b46bcc0a3da47431f2711c3d63e9507cfab18ecd (patch) | |
| tree | 6b9355395470108f5161840638bf48af0e10f3c1 /arch/arm/mach-tegra/board-cardhu-power.c | |
| parent | 63fb092060747250a0dd305bd11018caebe23d65 (diff) | |
| parent | f61bdbde09605793cfa05f7c59545c62b5e08aa6 (diff) | |
Merge commit 'main-ics-2012.06.04-A5' into HEAD
Conflicts:
drivers/media/video/tegra/nvavp/nvavp_dev.c
Change-Id: I7779b0ce58004f80cccf6193148ac49551ce5da5
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index 61b5a15ed5c7..d517d8266204 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu-power.c * - * Copyright (C) 2011-2012 NVIDIA, Inc. + * Copyright (C) 2011-2012, NVIDIA Corporation. * * 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 @@ -42,7 +42,6 @@ #include "board.h" #include "board-cardhu.h" #include "pm.h" -#include "wakeups-t3.h" #include "tegra3_tsensor.h" #define PMC_CTRL 0x0 @@ -994,7 +993,6 @@ static struct platform_device *fixed_reg_devs_e1291_a04[] = { int __init cardhu_fixed_regulator_init(void) { - int i; struct board_info board_info; struct board_info pmu_board_info; struct board_info display_board_info; |