projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'wireless-next/master' into ath6kl-next
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
mach_timer.h
diff --git
a/arch/x86/include/asm/mach_timer.h
b/arch/x86/include/asm/mach_timer.h
index
8537285
..
88d0c3c
100644
(file)
--- a/
arch/x86/include/asm/mach_timer.h
+++ b/
arch/x86/include/asm/mach_timer.h
@@
-15,7
+15,7
@@
#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */
#define CALIBRATE_LATCH \
- ((
CLOCK
_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000)
+ ((
PIT
_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000)
static inline void mach_prepare_counter(void)
{