ppc4xx: Fix merge problems in 44x_spd_ddr2.c
authorStefan Roese <sr@denx.de>
Thu, 10 Jul 2008 13:32:32 +0000 (15:32 +0200)
committerStefan Roese <sr@denx.de>
Fri, 11 Jul 2008 11:18:13 +0000 (13:18 +0200)
commit08250eb2edbd96514d049602d9e134110ac3185f
treed464cbb4d2b51906e848c3c8445d202441200d15
parent1740c1bf40e3c6d03ac16c29943fdd9fc1e87038
ppc4xx: Fix merge problems in 44x_spd_ddr2.c

Signed-off-by: Stefan Roese <sr@denx.de>
cpu/ppc4xx/44x_spd_ddr2.c