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 commit 'v2.6.37-rc1' into for-2.6.37
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
dmtimer.h
diff --git
a/arch/arm/plat-omap/include/plat/dmtimer.h
b/arch/arm/plat-omap/include/plat/dmtimer.h
index
20f1054
..
dfa3aff
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/
arch/arm/plat-omap/include/plat/dmtimer.h
@@
-45,6
+45,8
@@
#define OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE 0x02
struct omap_dm_timer;
+extern struct omap_dm_timer *gptimer_wakeup;
+extern struct sys_timer omap_timer;
struct clk;
int omap_dm_timer_init(void);