mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / sa1100.h