arm: mach-msm: fix merge error
mach-msm: Makefile: Don't build MP-Decision