drivers/video/msm/mdp.c: fix merge derp!

Signed-off-by: Paul Reioux <reioux@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>