This cset fixes various PCI and FPA11 FPE related build warnings and
errors resulting from changes from 2.5.47 to 2.5.48.