From: Joseph Lo <josephl@nvidia.com>
Date: Mon, 15 Apr 2013 22:53:05 +0000 (-0600)
Subject: ARM: tegra: pm: fix build error w/o PM_SLEEP
X-Git-Tag: v3.12-rc1~931^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=128673b3646beba4f5a41f50a7a21c3c2f3455ca;p=kernel%2Fkernel-generic.git

ARM: tegra: pm: fix build error w/o PM_SLEEP

This fixes the building error when the PM_SLEEP is disabled. The fucntional
defintion of "tegra_pm_validate_suspend_mode" without "static inline"
would become a multiple definition error.

Reported-by: Rhyland Klein <rklein@nvidia.com>
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h
index 9d2d038..778a4aa 100644
--- a/arch/arm/mach-tegra/pm.h
+++ b/arch/arm/mach-tegra/pm.h
@@ -39,7 +39,7 @@ enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
 				enum tegra_suspend_mode mode);
 void tegra_init_suspend(void);
 #else
-enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
+static inline enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
 				enum tegra_suspend_mode mode)
 {
 	return TEGRA_SUSPEND_NONE;