projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
[oweals/u-boot.git]
/
cpu
/
i386
/
timer.c
diff --git
a/cpu/i386/timer.c
b/cpu/i386/timer.c
index 486d927a5a8a8c4cb5da7cbf220d0be91f4a3e05..46db23f59c6ebdf507f1e6d4df6bd0976a2439c2 100644
(file)
--- a/
cpu/i386/timer.c
+++ b/
cpu/i386/timer.c
@@
-72,9
+72,9
@@
int timer_init(void)
}
}
-#ifdef C
FG
_TIMER_GENERIC
+#ifdef C
ONFIG_SYS
_TIMER_GENERIC
-/* the unit for these is C
FG
_HZ */
+/* the unit for these is C
ONFIG_SYS
_HZ */
/* FixMe: implement these */
void reset_timer (void)
/* FixMe: implement these */
void reset_timer (void)