Commit-ID: cbf1599b3589c6c73999095ca25e9c3f23042e19 Gitweb: http://git.kernel.org/tip/cbf1599b3589c6c73999095ca25e9c3f23042e19 Author: Deepak Saxena <dsaxena@xxxxxxxxxx> AuthorDate: Tue, 1 Nov 2011 14:25:01 -0700 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Mon, 21 Nov 2011 19:00:58 -0800 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@xxxxxxxxxx> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- drivers/clocksource/acpi_pm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index effe797..6b5cf02 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. -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|