diff --git a/[refs] b/[refs]
index 001090fdc8a8..c4538ab34ef2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a100caaf12c871f040d34437229156b8b5670059
+refs/heads/master: 128673b3646beba4f5a41f50a7a21c3c2f3455ca
diff --git a/trunk/arch/arm/mach-tegra/pm.h b/trunk/arch/arm/mach-tegra/pm.h
index 9d2d038bf12e..778a4aa7c3fa 100644
--- a/trunk/arch/arm/mach-tegra/pm.h
+++ b/trunk/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;