ppc4xx: Fix small merge problems with CPCI440 and Acadia boards
authorStefan Roese <sr@denx.de>
Fri, 5 Oct 2007 19:28:58 +0000 (21:28 +0200)
committerStefan Roese <sr@denx.de>
Wed, 31 Oct 2007 20:20:50 +0000 (21:20 +0100)
commitdb3232ddb058d0ed0bc31f7c5c296748a1afac67
treeff0e534cdb4a00a0160dd8840596bdfe20209e86
parent1941cce71b1ae975602854045061e82f94ecd012
ppc4xx: Fix small merge problems with CPCI440 and Acadia boards

Signed-off-by: Stefan Roese <sr@denx.de>
board/esd/cpci440/cpci440.c
include/ppc405.h