diff options
Diffstat (limited to 'debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch')
| -rw-r--r-- | debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch b/debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch deleted file mode 100644 index 03bbe3a45..000000000 --- a/debian/patches/bugfix/arm/arm-ixp4xx-Rename-FREQ-macro-to-avoid-collisions-2.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 991f3c04fdbd9084935be1e16aef55f610f35b0c Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Fri, 10 Dec 2010 02:45:03 +0000 -Subject: [PATCH 1/4] 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. - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - arch/arm/mach-ixp4xx/common.c | 4 ++-- - arch/arm/mach-ixp4xx/include/mach/timex.h | 5 +++-- - drivers/input/misc/ixp4xx-beeper.c | 6 +----- - 3 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c -index 0bce097..f5c42fe 100644 ---- a/arch/arm/mach-ixp4xx/common.c -+++ b/arch/arm/mach-ixp4xx/common.c -@@ -415,7 +415,7 @@ static struct clocksource clocksource_ixp4xx = { - .flags = CLOCK_SOURCE_IS_CONTINUOUS, - }; - --unsigned long ixp4xx_timer_freq = FREQ; -+unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ; - EXPORT_SYMBOL(ixp4xx_timer_freq); - static void __init ixp4xx_clocksource_init(void) - { -@@ -491,7 +491,7 @@ static struct clock_event_device clockevent_ixp4xx = { - - static void __init ixp4xx_clockevent_init(void) - { -- clockevent_ixp4xx.mult = div_sc(FREQ, NSEC_PER_SEC, -+ clockevent_ixp4xx.mult = div_sc(IXP4XX_TIMER_FREQ, NSEC_PER_SEC, - clockevent_ixp4xx.shift); - clockevent_ixp4xx.max_delta_ns = - clockevent_delta2ns(0xfffffffe, &clockevent_ixp4xx); -diff --git a/arch/arm/mach-ixp4xx/include/mach/timex.h b/arch/arm/mach-ixp4xx/include/mach/timex.h -index 2c3f93c..c9e930f 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) - -diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c -index 9dfd6e5..1f38302 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); - --- -1.7.2.3 - |