Merge with default.

diff --combined arch/ppc/mpc55xx/drivers/sys_tick.c
index 00d89b16c97d226925806aecefef6b2ce57946af,19267186e3a34832f74122d3d96e51b4fa5df0fd..0d327688db54bbf677d0b8b650be6fb358986ba7
--- 1/arch/ppc/mpc55xx/drivers/sys_tick.c
--- 2/arch/ppc/mpc55xx/drivers/sys_tick.c
+++ b/arch/ppc/mpc55xx/drivers/sys_tick.c
@@@ -31,7 -31,7 +31,7 @@@ void Os_SysTickInit( void ) 
  #if defined(CFG_MPC5606S)\r
        Irq_AttachIsr2(tid, NULL, RTC_INT);  /* Attach ISR2 to RTC interrupt */\r
  #else\r
-       Irq_AttachIsr2(tid, NULL, 7);  /* Attach ISR2 to RTC interrupt */\r
+       Irq_AttachIsr2(tid, NULL, 7);  /* Attach ISR2 to INTC_SSCIR0_CLR7  */\r
  #endif\r
  }\r
  \r
@@@ -59,9 -59,9 +59,9 @@@ void Os_SysTickStart(uint32_t period_ti
  \r
        RTC.RTCC.B.CNTEN = 1;           // start RTC\r
  #else\r
 -              uint32 tmp;\r
  \r
        // Enable the TB\r
 +              uint32_t tmp;\r
        tmp = get_spr(SPR_HID0);\r
        tmp |= HID0_TBEN;\r
        set_spr(SPR_HID0, tmp);\r