projects
/
platform
/
kernel
/
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 ../work into next
[platform/kernel/u-boot.git]
/
lib_i386
/
timer.c
diff --git
a/lib_i386/timer.c
b/lib_i386/timer.c
index
58a0212
..
5cb1f54
100644
(file)
--- a/
lib_i386/timer.c
+++ b/
lib_i386/timer.c
@@
-51,7
+51,7
@@
int register_timer_isr (timer_fnc_t *isr_func)
if (new_func == NULL)
return 1;
- new_func->isr_func = isr_func
+ gd->reloc_off
;
+ new_func->isr_func = isr_func;
new_func->next = NULL;
/*