diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 16:13:49 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 16:13:49 -0500 |
| commit | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (patch) | |
| tree | c13038d099e04208feae565947783cf92ceae9ee /drivers/clocksource/acpi_pm.c | |
| parent | 28a00184be261e3dc152ba0d664a067bbe235b6a (diff) | |
| parent | f5a54dd7952e9032785cd1ef0dde72cd61025341 (diff) | |
Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'drivers/clocksource/acpi_pm.c')
| -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. |