[PATCH] powerpc: merge oprofile headers