2013-03-14 09:12:31

by Hiroshi Doyu

[permalink] [raw]
Subject: [PATCH 1/1] memory: tegra30: Fix build error w/o PM

Make this depend on CONFIG_PM.

Signed-off-by: Hiroshi Doyu <[email protected]>
---
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


2013-03-14 09:40:31

by Thierry Reding

[permalink] [raw]
Subject: Re: [PATCH 1/1] memory: tegra30: Fix build error w/o PM

On Thu, Mar 14, 2013 at 11:12:10AM +0200, Hiroshi Doyu wrote:
> Make this depend on CONFIG_PM.
>
> Signed-off-by: Hiroshi Doyu <[email protected]>
> ---
> 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 <[email protected]>

Attachments:
(No filename) (862.00 B)
 (No filename) (836.00 B)
 Download all attachments

2013-03-15 19:23:41

by Stephen Warren

[permalink] [raw]
Subject: Re: [PATCH 1/1] memory: tegra30: Fix build error w/o PM

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.