include/media/msm_camera.h: fix mismerge