merge with pdur2

diff --cc arch/ppc/mpc55xx/drivers/sys_tick.c
index 00d89b16c97d226925806aecefef6b2ce57946af,19267186e3a34832f74122d3d96e51b4fa5df0fd..2145626bafdddf86e1936b2444a731618417ccdf
--- 1/arch/ppc/mpc55xx/drivers/sys_tick.c
--- 2/arch/ppc/mpc55xx/drivers/sys_tick.c
+++ b/arch/ppc/mpc55xx/drivers/sys_tick.c
@@@ -94,14 -94,14 +94,14 @@@ TickType Os_SysTickGetValue( void 
  {\r
        uint32_t timer = get_spr(SPR_DECAR) - get_spr(SPR_DEC);\r
        return (timer);\r
--}
--
--TickType Os_SysTickGetElapsedValue( uint32_t preValue ) {
--      uint32_t curr;
--      uint32_t max;
--
--      curr = get_spr(SPR_DEC);
--      max  = get_spr(SPR_DECAR);
--      return Os_CounterDiff((max - curr),preValue,max);
--}
++}\r
++\r
++TickType Os_SysTickGetElapsedValue( uint32_t preValue ) {\r
++      uint32_t curr;\r
++      uint32_t max;\r
++\r
++      curr = get_spr(SPR_DEC);\r
++      max  = get_spr(SPR_DECAR);\r
++      return Os_CounterDiff((max - curr),preValue,max);\r
++}\r
  \r