diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /lib_ppc/time.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'lib_ppc/time.c')
| -rw-r--r-- | lib_ppc/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_ppc/time.c b/lib_ppc/time.c index f093a5785..173ffab3e 100644 --- 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 *) CFG_IMMR; + volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; /* unlock */ immap->im_sitk.sitk_tbk = KAPWR_KEY; |