summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroshi Doyu <hdoyu@nvidia.com>2013-03-14 11:12:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-15 11:10:49 -0700
commit9f7345b7a7cbf4c78a8161cba21de1772d5ad56e (patch)
treebd90e72e137cda865bb5a18e94638e7062108ee5
parentaafae7ecd80181983403de13db0b4895acdc233d (diff)
downloadlinux-9f7345b7a7cbf4c78a8161cba21de1772d5ad56e.tar.bz2
memory: tegra30: Fix build error w/o PM
Make this depend on CONFIG_PM. Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/memory/tegra30-mc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
index 0b975986777d..f4ae074badc3 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,