summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorDeepak Saxena <dsaxena@linaro.org>2011-11-01 22:25:01 +0100
committerJohn Stultz <john.stultz@linaro.org>2011-11-22 04:00:58 +0100
commitcbf1599b3589c6c73999095ca25e9c3f23042e19 (patch)
tree121b317da5cfd8160d2daf8ddde87f4e245329a6 /drivers/clocksource
parenttime: x86: Remove CLOCK_TICK_RATE from mach_timer.h (diff)
downloadlinux-cbf1599b3589c6c73999095ca25e9c3f23042e19.tar.xz
linux-cbf1599b3589c6c73999095ca25e9c3f23042e19.zip
time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
The acpi_pm clocksource driver uses CLOCK_TICK_RATE which is defined as PIT_TICK_RATE on x86. This patch cleans it up to just use the later so that CLOCK_TICK_RATE can be depecrated. Signed-off-by: Deepak Saxena <dsaxena@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/acpi_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index effe7974aa9a..6b5cf02c35c8 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
#ifndef CONFIG_X86_64
#include <asm/mach_timer.h>
#define PMTMR_EXPECTED_RATE \
- ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10))
+ ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (PIT_TICK_RATE>>10))
/*
* Some boards have the PMTMR running way too fast. We check
* the PMTMR rate against PIT channel 2 to catch these cases.