mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / video_font.h
2000-10-25 wdenkInitial revision