diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2010-12-11 20:17:54 +0000 |
|---|---|---|
| committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2011-02-06 16:49:48 +0100 |
| commit | e66a022a80d73b1a5d2e02c9db2c42e8b9853b40 (patch) | |
| tree | 5cb5fad6215fa36a1388c15dee969b58ded1271e /arch/arm/mach-ixp4xx/include/mach/timex.h | |
| parent | 3c3a3b4c12bdda8dd098fcdd4499a298548d6f31 (diff) | |
arm/ixp4xx: Rename FREQ macro to avoid collisions
FREQ is a ridiculously short name for a platform-specific macro in a
generic header, and it now conflicts with an enumeration in the
gspca/ov519 driver.
Also delete conditional reference to ixp4xx_get_board_tick_rate()
which is not defined anywhere.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include/mach/timex.h')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/timex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/timex.h b/arch/arm/mach-ixp4xx/include/mach/timex.h index 2c3f93c3eb7..c9e930f2933 100644 --- 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. */ -#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) |