mm: proc-v7.S: Fix conflict