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:43:19 -0800 |
| commit | fb890857b61489bd2cf0ad03a6ef6e7de95f5df1 (patch) | |
| tree | 337bce79b6f4b2c92d9ce0cefa804b875c35c42f | |
| parent | d94e0061f81729f9fc12b1c005bb2b2c91263f21 (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: Rb173a5f138bb81da15ee531e5e9cfb6974f7190b
| -rw-r--r-- | arch/arm/mach-tegra/tegra_i2s_audio.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra_spdif_audio.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/tegra_i2s_audio.c b/arch/arm/mach-tegra/tegra_i2s_audio.c index f8563ae89d0a..1368d173a2ba 100644 --- a/arch/arm/mach-tegra/tegra_i2s_audio.c +++ b/arch/arm/mach-tegra/tegra_i2s_audio.c @@ -1914,7 +1914,7 @@ static int tegra_audio_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int tegra_audio_suspend(struct platform_device *pdev, pm_message_t mesg) { /* dev_info(&pdev->dev, "%s\n", __func__); */ @@ -1925,7 +1925,7 @@ static int tegra_audio_resume(struct platform_device *pdev) { return i2s_configure(pdev); } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ static struct platform_driver tegra_audio_driver = { .driver = { @@ -1933,7 +1933,7 @@ static struct platform_driver tegra_audio_driver = { .owner = THIS_MODULE, }, .probe = tegra_audio_probe, -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP .suspend = tegra_audio_suspend, .resume = tegra_audio_resume, #endif diff --git a/arch/arm/mach-tegra/tegra_spdif_audio.c b/arch/arm/mach-tegra/tegra_spdif_audio.c index 488de0d89da7..c23ebdf2fe1f 100644 --- a/arch/arm/mach-tegra/tegra_spdif_audio.c +++ b/arch/arm/mach-tegra/tegra_spdif_audio.c @@ -1144,7 +1144,7 @@ static int tegra_spdif_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int tegra_spdif_suspend(struct platform_device *pdev, pm_message_t mesg) { /* dev_info(&pdev->dev, "%s\n", __func__); */ @@ -1155,7 +1155,7 @@ static int tegra_spdif_resume(struct platform_device *pdev) { return spdif_configure(pdev); } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ static struct platform_driver tegra_spdif_driver = { .driver = { @@ -1163,7 +1163,7 @@ static struct platform_driver tegra_spdif_driver = { .owner = THIS_MODULE, }, .probe = tegra_spdif_probe, -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP .suspend = tegra_spdif_suspend, .resume = tegra_spdif_resume, #endif |