diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /drivers/clocksource/acpi_pm.c | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into core/ipi
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 e1129fad96dd..ee19b6e8fcb4 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 | #endif | 143 | #endif |
| 144 | 144 | ||
| 145 | #ifndef CONFIG_X86_64 | 145 | #ifndef CONFIG_X86_64 |
| 146 | #include "mach_timer.h" | 146 | #include <asm/mach_timer.h> |
| 147 | #define PMTMR_EXPECTED_RATE \ | 147 | #define PMTMR_EXPECTED_RATE \ |
| 148 | ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) | 148 | ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) |
| 149 | /* | 149 | /* |