MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.