Merge 'next' branch

Conflicts:

	board/freescale/mpc8536ds/mpc8536ds.c
	include/configs/mgcoge.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/cpu/arm946es/interrupts.c b/cpu/arm946es/interrupts.c
index a2c3646..c13d309 100644
--- a/cpu/arm946es/interrupts.c
+++ b/cpu/arm946es/interrupts.c
@@ -121,10 +121,10 @@ void udelay_masked (unsigned long usec)
 
 	if(usec >= 1000){               /* if "big" number, spread normalization to seconds */
 		tmo = usec / 1000;      /* start to normalize for usec to ticks per sec */
-		tmo *= CFG_HZ_CLOCK;    /* find number of "ticks" to wait to achieve target */
+		tmo *= CONFIG_SYS_HZ_CLOCK;    /* find number of "ticks" to wait to achieve target */
 		tmo /= 1000;            /* finish normalize. */
 	}else{                          /* else small number, don't kill it prior to HZ multiply */
-		tmo = usec * CFG_HZ_CLOCK;
+		tmo = usec * CONFIG_SYS_HZ_CLOCK;
 		tmo /= (1000*1000);
 	}
 
@@ -151,7 +151,7 @@ ulong get_tbclk (void)
 {
 	ulong tbclk;
 
-	tbclk = CFG_HZ;
+	tbclk = CONFIG_SYS_HZ;
 	return tbclk;
 }