mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / lpd7a400_cpld.h
2004-06-09 wdenk* Patch by Paul Ruhland, 17 May 2004: