M2_SPR: benign ifdef/compilation changes (make sure we can compile other boardfiles too)

Conflicts:
	drivers/video/msm/hdmi_msm.c