aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-04-03 21:49:37 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-04-03 21:51:13 +0200
commitace9beabf42b4ff646ec0ada5ff48d95fbafa6fc (patch)
treeaf29f0bb6d497dac3c591672e527f349e2f1b4c6
parent702554ce1d91fa5684988233ae5f929575f17fe6 (diff)
downloadkernel_goldelico_gta04-ace9beabf42b4ff646ec0ada5ff48d95fbafa6fc.zip
kernel_goldelico_gta04-ace9beabf42b4ff646ec0ada5ff48d95fbafa6fc.tar.gz
kernel_goldelico_gta04-ace9beabf42b4ff646ec0ada5ff48d95fbafa6fc.tar.bz2
MERGE with: PM: Implement early suspend api
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--kernel/power/power.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h
index a88c96c..87aaa45 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -294,11 +294,9 @@ extern int pm_wake_lock(const char *buf);
extern int pm_wake_unlock(const char *buf);
#endif /* !CONFIG_PM_WAKELOCKS */
-=======
extern struct workqueue_struct *suspend_work_queue;
extern struct wake_lock main_wake_lock;
extern suspend_state_t requested_suspend_state;
-#endif
#ifdef CONFIG_EARLYSUSPEND
/* kernel/power/earlysuspend.c */