mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / console.h
2000-11-12 wdenkInitial revision