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 /drivers/input | |
| parent | 3c3a3b4c12bdda8dd098fcdd4499a298548d6f31 (diff) | |
| download | linux-3.10-e66a022a80d73b1a5d2e02c9db2c42e8b9853b40.tar.gz linux-3.10-e66a022a80d73b1a5d2e02c9db2c42e8b9853b40.tar.bz2 linux-3.10-e66a022a80d73b1a5d2e02c9db2c42e8b9853b40.zip | |
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 'drivers/input')
| -rw-r--r-- | drivers/input/misc/ixp4xx-beeper.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 9dfd6e5f786..1f38302a595 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c @@ -69,11 +69,7 @@ static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned } if (value > 20 && value < 32767) -#ifndef FREQ - count = (ixp4xx_get_board_tick_rate() / (value * 4)) - 1; -#else - count = (FREQ / (value * 4)) - 1; -#endif + count = (IXP4XX_TIMER_FREQ / (value * 4)) - 1; ixp4xx_spkr_control(pin, count); |