From 790e85596b20b87f8f9dbc56bde434f1603018e9 Mon Sep 17 00:00:00 2001
From: Hiroshi Doyu <hdoyu@nvidia.com>
Date: Wed, 21 Nov 2012 14:41:37 +0200
Subject: [PATCH] --- yaml --- r: 347372 b: refs/heads/master c:
 f110174910896b7a7d91c0c60d19136815f68c54 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/amba/tegra-ahb.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4d2a5ab6275f..6b433798561f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e25e1b178ee3caf34f229bacfad5ae6780bcec6
+refs/heads/master: f110174910896b7a7d91c0c60d19136815f68c54
diff --git a/trunk/drivers/amba/tegra-ahb.c b/trunk/drivers/amba/tegra-ahb.c
index 0b6f0b28a487..ce8fdadf3696 100644
--- a/trunk/drivers/amba/tegra-ahb.c
+++ b/trunk/drivers/amba/tegra-ahb.c
@@ -156,6 +156,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn)
 EXPORT_SYMBOL(tegra_ahb_enable_smmu);
 #endif
 
+#ifdef CONFIG_PM_SLEEP
 static int tegra_ahb_suspend(struct device *dev)
 {
 	int i;
@@ -175,6 +176,7 @@ static int tegra_ahb_resume(struct device *dev)
 		gizmo_writel(ahb, ahb->ctx[i], tegra_ahb_gizmo[i]);
 	return 0;
 }
+#endif
 
 static UNIVERSAL_DEV_PM_OPS(tegra_ahb_pm,
 			    tegra_ahb_suspend,