From 1718aade774a1e1e2491c5febb2074ad7f09cb98 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 12 Mar 2008 10:48:48 +1100 Subject: [PATCH] --- yaml --- r: 87268 b: refs/heads/master c: a99d9a6ebdf8328d5c61ca9f1038f4815e25720e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pmu.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 08eea07c7e91..5c76db6c8628 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07c941d00087581c9553661c2c4fb593da37f525 +refs/heads/master: a99d9a6ebdf8328d5c61ca9f1038f4815e25720e diff --git a/trunk/include/linux/pmu.h b/trunk/include/linux/pmu.h index b02b57c0fba0..cafe98d96948 100644 --- a/trunk/include/linux/pmu.h +++ b/trunk/include/linux/pmu.h @@ -147,8 +147,15 @@ extern void pmu_wait_complete(struct adb_request *req); /* For use before switching interrupts off for a long time; * warning: not stackable */ +#if defined(CONFIG_ADB_PMU) extern void pmu_suspend(void); extern void pmu_resume(void); +#else +static inline void pmu_suspend(void) +{} +static inline void pmu_resume(void) +{} +#endif extern void pmu_enable_irled(int on);