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

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

Conflicts:
	drivers/video/msm/mdp.c