summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroshi Doyu <hdoyu@nvidia.com>2013-03-15 07:54:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-03-15 17:20:02 +0000
commit2c36af0e559c0a0674ad846527116df41aa5f612 (patch)
treeaf49f2fdc04f2f971ba664cf31e20bae4393666f
parentf7db706b132f11c79ae1d74b2382e0926cf31644 (diff)
downloadlinux-stable-2c36af0e559c0a0674ad846527116df41aa5f612.tar.gz
linux-stable-2c36af0e559c0a0674ad846527116df41aa5f612.tar.bz2
linux-stable-2c36af0e559c0a0674ad846527116df41aa5f612.zip
ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME
Make this depend on CONFIG_PM. This protection is necessary to not cause any build errors with any combination of PM features especially when supporting a new SoC where each PM features are being enabled one-by-one during its depelopment. Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/amba/tegra-ahb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c
index 093c43554963..1f44e56cc65d 100644
--- a/drivers/amba/tegra-ahb.c
+++ b/drivers/amba/tegra-ahb.c
@@ -158,7 +158,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn)
EXPORT_SYMBOL(tegra_ahb_enable_smmu);
#endif
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
static int tegra_ahb_suspend(struct device *dev)
{
int i;