git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/futexes
[sfrench/cifs-2.6.git]
/
drivers
/
clocksource
/
acpi_pm.c
diff --git
a/drivers/clocksource/acpi_pm.c
b/drivers/clocksource/acpi_pm.c
index e1129fad96dd2c75a20cc283dc6e53045b3a553d..ee19b6e8fcb4545a4bf14f7d433141db217a0434 100644
(file)
--- 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,
#endif
#ifndef CONFIG_X86_64
-#include
"mach_timer.h"
+#include
<asm/mach_timer.h>
#define PMTMR_EXPECTED_RATE \
((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10))
/*