diff --git a/[refs] b/[refs]
index 3c0bda913ad3..32481b3137f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad43ff98ac926e37ecbdef04ba7d4d104604028
+refs/heads/master: d601c795c41c0016790ff1a92f2307fd4ff29791
diff --git a/trunk/drivers/video/msm/mdp.c b/trunk/drivers/video/msm/mdp.c
index 2b5bf79ffe75..c3636d55a3c5 100644
--- a/trunk/drivers/video/msm/mdp.c
+++ b/trunk/drivers/video/msm/mdp.c
@@ -482,6 +482,7 @@ int mdp_probe(struct platform_device *pdev)
 	/* register mdp device */
 	mdp->mdp_dev.dev.parent = &pdev->dev;
 	mdp->mdp_dev.dev.class = mdp_class;
+	dev_set_name(&mdp->mdp_dev.dev, "mdp%d", pdev->id);
 
 	/* if you can remove the platform device you'd have to implement
 	 * this: