Patchwork [1/1] memory: tegra30: Fix build error w/o PM

login
register
mail settings
Submitter Hiroshi Doyu
Date March 14, 2013, 9:12 a.m.
Message ID <1363252334-4672-1-git-send-email-hdoyu@nvidia.com>
Download mbox | patch
Permalink /patch/227513/
State Accepted, archived
Headers show

Comments

Hiroshi Doyu - March 14, 2013, 9:12 a.m.
Make this depend on CONFIG_PM.

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
 drivers/memory/tegra30-mc.c | 2 ++
 1 file changed, 2 insertions(+)
Thierry Reding - March 14, 2013, 9:40 a.m.
On Thu, Mar 14, 2013 at 11:12:10AM +0200, Hiroshi Doyu wrote:
> Make this depend on CONFIG_PM.
> 
> Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
> ---
>  drivers/memory/tegra30-mc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
> index 0b97598..f4ae074 100644
> --- a/drivers/memory/tegra30-mc.c
> +++ b/drivers/memory/tegra30-mc.c
> @@ -268,6 +268,7 @@ static const u32 tegra30_mc_ctx[] = {
>  	MC_INTMASK,
>  };
>  
> +#ifdef CONFIG_PM
>  static int tegra30_mc_suspend(struct device *dev)
>  {
>  	int i;
> @@ -291,6 +292,7 @@ static int tegra30_mc_resume(struct device *dev)
>  	mc_readl(mc, MC_TIMING_CONTROL);
>  	return 0;
>  }
> +#endif
>  
>  static UNIVERSAL_DEV_PM_OPS(tegra30_mc_pm,
>  			    tegra30_mc_suspend,

Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Stephen Warren - March 15, 2013, 7:23 p.m.
On 03/14/2013 03:12 AM, Hiroshi Doyu wrote:
> Make this depend on CONFIG_PM.

Applied to Tegra's for-3.10/fixes branch.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
index 0b97598..f4ae074 100644
--- a/drivers/memory/tegra30-mc.c
+++ b/drivers/memory/tegra30-mc.c
@@ -268,6 +268,7 @@  static const u32 tegra30_mc_ctx[] = {
 	MC_INTMASK,
 };
 
+#ifdef CONFIG_PM
 static int tegra30_mc_suspend(struct device *dev)
 {
 	int i;
@@ -291,6 +292,7 @@  static int tegra30_mc_resume(struct device *dev)
 	mc_readl(mc, MC_TIMING_CONTROL);
 	return 0;
 }
+#endif
 
 static UNIVERSAL_DEV_PM_OPS(tegra30_mc_pm,
 			    tegra30_mc_suspend,