git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
pm.h
diff --git
a/arch/arm/mach-omap2/pm.h
b/arch/arm/mach-omap2/pm.h
index
bd6466a
..
3de6ece
100644
(file)
--- a/
arch/arm/mach-omap2/pm.h
+++ b/
arch/arm/mach-omap2/pm.h
@@
-43,6
+43,7
@@
extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
extern u32 wakeup_timer_seconds;
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
extern u32 wakeup_timer_seconds;
+extern u32 wakeup_timer_milliseconds;
extern struct omap_dm_timer *gptimer_wakeup;
#ifdef CONFIG_PM_DEBUG
extern struct omap_dm_timer *gptimer_wakeup;
#ifdef CONFIG_PM_DEBUG