| commit | b7896ad9053d11888511b3e5a8c7af2ee441e333 | [log] [tgz] |
|---|---|---|
| author | Dave Liu <r63238@freescale.com> | Thu Jan 17 18:23:19 2008 +0800 |
| committer | Kim Phillips <kim.phillips@freescale.com> | Thu Jan 17 11:01:52 2008 -0600 |
| tree | 3480bb902c877d92ce4eeeb1f9e5fd062cbc0ada | |
| parent | a0c03a7dd144c39fa58733484c8c3d84dd22b84a [diff] |
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>