video/msm: fix major merge failure

Signed-off-by: helicopter88 <johnlemon.lol@gmail.com>