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
arm/ixp4xx: Rename FREQ macro to avoid collisions
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
include
/
mach
/
timex.h
diff --git
a/arch/arm/mach-ixp4xx/include/mach/timex.h
b/arch/arm/mach-ixp4xx/include/mach/timex.h
index
2c3f93c
..
c9e930f
100644
(file)
--- a/
arch/arm/mach-ixp4xx/include/mach/timex.h
+++ b/
arch/arm/mach-ixp4xx/include/mach/timex.h
@@
-10,6
+10,7
@@
* 66.66... MHz. We do a convulted calculation of CLOCK_TICK_RATE b/c the
* timer register ignores the bottom 2 bits of the LATCH value.
*/
* 66.66... MHz. We do a convulted calculation of CLOCK_TICK_RATE b/c the
* timer register ignores the bottom 2 bits of the LATCH value.
*/
-#define FREQ 66666000
-#define CLOCK_TICK_RATE (((FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)
+#define IXP4XX_TIMER_FREQ 66666000
+#define CLOCK_TICK_RATE \
+ (((IXP4XX_TIMER_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)