public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] memory: tegra30: Fix build error w/o PM
@ 2013-03-14  9:12 Hiroshi Doyu
  2013-03-14  9:40 ` Thierry Reding
  2013-03-15 19:23 ` Stephen Warren
  0 siblings, 2 replies; 3+ messages in thread
From: Hiroshi Doyu @ 2013-03-14  9:12 UTC (permalink / raw)
  To: linux-tegra
  Cc: Hiroshi Doyu, Stephen Warren, Greg Kroah-Hartman, Thierry Reding,
	Axel Lin, linux-kernel

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,
-- 
1.8.1.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] memory: tegra30: Fix build error w/o PM
  2013-03-14  9:12 [PATCH 1/1] memory: tegra30: Fix build error w/o PM Hiroshi Doyu
@ 2013-03-14  9:40 ` Thierry Reding
  2013-03-15 19:23 ` Stephen Warren
  1 sibling, 0 replies; 3+ messages in thread
From: Thierry Reding @ 2013-03-14  9:40 UTC (permalink / raw)
  To: Hiroshi Doyu
  Cc: linux-tegra, Stephen Warren, Greg Kroah-Hartman, Axel Lin,
	linux-kernel

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

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>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] memory: tegra30: Fix build error w/o PM
  2013-03-14  9:12 [PATCH 1/1] memory: tegra30: Fix build error w/o PM Hiroshi Doyu
  2013-03-14  9:40 ` Thierry Reding
@ 2013-03-15 19:23 ` Stephen Warren
  1 sibling, 0 replies; 3+ messages in thread
From: Stephen Warren @ 2013-03-15 19:23 UTC (permalink / raw)
  To: Hiroshi Doyu
  Cc: linux-tegra, Greg Kroah-Hartman, Thierry Reding, Axel Lin,
	linux-kernel

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-03-15 19:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-14  9:12 [PATCH 1/1] memory: tegra30: Fix build error w/o PM Hiroshi Doyu
2013-03-14  9:40 ` Thierry Reding
2013-03-15 19:23 ` Stephen Warren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox