tree 3480bb902c877d92ce4eeeb1f9e5fd062cbc0ada
parent f188896c2f1594fe749fdb99bbc8c54023cfab3a
author Dave Liu <r63238@freescale.com> 1200565399 +0800
committer Kim Phillips <kim.phillips@freescale.com> 1200589312 -0600

mpc83xx: Fix the fatal conflict of merge

The commit 9e89647889cd4b5ada5b5e7cad6cbe55737a08d7
will cause the mpc8315erdb board can't boot up.

The patch fix that bug, and remove the duplicated #ifdef
CFG_SPCR_TSECEP code and clean the SCCR_TSEC2 for
MPC8313E processor.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>