diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-06-28 13:09:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:49 -0800 |
| commit | 150a0bd861b0032f0272d982a00b2e980b94d417 (patch) | |
| tree | 145dd3437aae337505cb2a775ff7bc247b68cae3 /arch/arm/mach-tegra/pinmux-t3-tables.c | |
| parent | da45a94d0064aacb55a609fc060fa50abde0c418 (diff) | |
ARM: tegra: power: Use CONFIG_PM_SLEEP instead of CONFIG_PM
For Linux 2.6.39, CONFIG_PM_SLEEP is the proper kernel configuration
parameter to use on Tegra for power management, and not CONFIG_PM.
CONFIG_PM does not have the required dependency on CONFIG_SUSPEND
necessary to pull in the CPU suspend/resume functionality used by
Tegra.
Also fixes compilation errors when CONFIG_PM and by implication
CONFIG_PM_SLEEP are not configured.
Change-Id: I8bb380ae7c6b22759bfbc223febc28f585111aad
Reviewed-on: http://git-master/r/40458
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R61d656cd67439aa9f466c381845d7a4685fc8648
Diffstat (limited to 'arch/arm/mach-tegra/pinmux-t3-tables.c')
| -rw-r--r-- | arch/arm/mach-tegra/pinmux-t3-tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pinmux-t3-tables.c b/arch/arm/mach-tegra/pinmux-t3-tables.c index e607c6d94b0a..7b8979cba6e0 100644 --- a/arch/arm/mach-tegra/pinmux-t3-tables.c +++ b/arch/arm/mach-tegra/pinmux-t3-tables.c @@ -358,7 +358,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = { PINGROUP(HDMI_CEC, SYS, CEC, RSVD1, RSVD2, RSVD3, RSVD, INPUT, 0x33e0), }; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static u32 pinmux_reg[TEGRA_MAX_PINGROUP + ARRAY_SIZE(tegra_soc_drive_pingroups)]; |