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 git://git.denx.de/u-boot-mpc86xx
[platform/kernel/u-boot.git]
/
lib_ppc
/
time.c
diff --git
a/lib_ppc/time.c
b/lib_ppc/time.c
index
f093a57
..
173ffab
100644
(file)
--- a/
lib_ppc/time.c
+++ b/
lib_ppc/time.c
@@
-89,7
+89,7
@@
unsigned long ticks2usec(unsigned long ticks)
int init_timebase (void)
{
#if defined(CONFIG_5xx) || defined(CONFIG_8xx)
- volatile immap_t *immap = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immap = (immap_t *) C
ONFIG_SYS
_IMMR;
/* unlock */
immap->im_sitk.sitk_tbk = KAPWR_KEY;