Merge "Fix compiler warning in mips/dspr2"