mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / video_easylogo.h
2001-11-03 wdenkInitial revision