diff options
| author | Deepak Saxena <dsaxena@linaro.org> | 2011-11-01 17:25:01 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-21 22:00:58 -0500 |
| commit | cbf1599b3589c6c73999095ca25e9c3f23042e19 (patch) | |
| tree | 121b317da5cfd8160d2daf8ddde87f4e245329a6 /drivers | |
| parent | b0145bf3660359507a22e71b20b666c6620fa3a8 (diff) | |
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')
| -rw-r--r-- | 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 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, | |||
| 143 | #ifndef CONFIG_X86_64 | 143 | #ifndef CONFIG_X86_64 |
| 144 | #include <asm/mach_timer.h> | 144 | #include <asm/mach_timer.h> |
| 145 | #define PMTMR_EXPECTED_RATE \ | 145 | #define PMTMR_EXPECTED_RATE \ |
| 146 | ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) | 146 | ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (PIT_TICK_RATE>>10)) |
| 147 | /* | 147 | /* |
| 148 | * Some boards have the PMTMR running way too fast. We check | 148 | * Some boards have the PMTMR running way too fast. We check |
| 149 | * the PMTMR rate against PIT channel 2 to catch these cases. | 149 | * the PMTMR rate against PIT channel 2 to catch these cases. |