staging/octeon: fix up merge error