diff options
author | Joseph Lo <josephl@nvidia.com> | 2013-04-15 18:53:05 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-18 12:34:13 -0400 |
commit | 128673b3646beba4f5a41f50a7a21c3c2f3455ca (patch) | |
tree | 82da3601f6d7605483b2c6c576a2a03e38973e5a /arch | |
parent | a100caaf12c871f040d34437229156b8b5670059 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index 9d2d038bf12e..778a4aa7c3fa 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( | |||
39 | enum tegra_suspend_mode mode); | 39 | enum tegra_suspend_mode mode); |
40 | void tegra_init_suspend(void); | 40 | void tegra_init_suspend(void); |
41 | #else | 41 | #else |
42 | enum tegra_suspend_mode tegra_pm_validate_suspend_mode( | 42 | static inline enum tegra_suspend_mode tegra_pm_validate_suspend_mode( |
43 | enum tegra_suspend_mode mode) | 43 | enum tegra_suspend_mode mode) |
44 | { | 44 | { |
45 | return TEGRA_SUSPEND_NONE; | 45 | return TEGRA_SUSPEND_NONE; |