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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
timer.c
diff --git
a/arch/arm/mach-msm/timer.c
b/arch/arm/mach-msm/timer.c
index
4855b8c
..
dec5ca6
100644
(file)
--- a/
arch/arm/mach-msm/timer.c
+++ b/
arch/arm/mach-msm/timer.c
@@
-25,7
+25,9
@@
#include <asm/mach/time.h>
#include <mach/msm_iomap.h>
+#ifndef MSM_DGT_BASE
#define MSM_DGT_BASE (MSM_GPT_BASE + 0x10)
+#endif
#define MSM_DGT_SHIFT (5)
#define TIMER_MATCH_VAL 0x0000