Merge branch 'parisc' (PA-RISC compile fixes)