msm_fb: fix merge error

Change-Id: Ia968c3801edc4e62a80b8e1a74470779972d60fe