diff --git a/[refs] b/[refs]
index f4b6babe2e0a..63a2a37a5416 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b2e98cdf3a6ac6c57de6a2156c673d4b0262684
+refs/heads/master: f99c89297cd6995ccad6394c87383941c2570fe9
diff --git a/trunk/drivers/video/imxfb.c b/trunk/drivers/video/imxfb.c
index 5924cc225c95..1718baaeed2a 100644
--- a/trunk/drivers/video/imxfb.c
+++ b/trunk/drivers/video/imxfb.c
@@ -554,7 +554,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
 
 	inf = pdev->dev.platform_data;
 	if(!inf) {
-		dev_err(dev,"No platform_data available\n");
+		dev_err(&pdev->dev,"No platform_data available\n");
 		return -ENOMEM;
 	}
 
@@ -579,7 +579,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
 	if (!inf->fixed_screen_cpu) {
 		ret = imxfb_map_video_memory(info);
 		if (ret) {
-			dev_err(dev, "Failed to allocate video RAM: %d\n", ret);
+			dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret);
 			ret = -ENOMEM;
 			goto failed_map;
 		}
@@ -608,7 +608,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
 	imxfb_set_par(info);
 	ret = register_framebuffer(info);
 	if (ret < 0) {
-		dev_err(dev, "failed to register framebuffer\n");
+		dev_err(&pdev->dev, "failed to register framebuffer\n");
 		goto failed_register;
 	}