git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
timers
/
timer.c
diff --git
a/arch/i386/kernel/timers/timer.c
b/arch/i386/kernel/timers/timer.c
index
0526fc1
..
b2f722e
100644
(file)
--- a/
arch/i386/kernel/timers/timer.c
+++ b/
arch/i386/kernel/timers/timer.c
@@
-19,10
+19,10
@@
static struct timer_opts* timers[] = {
#ifdef CONFIG_HPET_TIMER
&timer_hpet,
#endif
+ &timer_tsc,
#ifdef CONFIG_X86_PM_TIMER
&timer_pmtmr,
#endif
- &timer_tsc,
&timer_pit,
NULL,
};