diff --git a/[refs] b/[refs]
index aa7af9335515..48e21394c66b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd21bfcc2d6e8b7fef20f05deef318b0ab7f8004
+refs/heads/master: 128485daadc53ff0570132c0c3ed70a6f0610bf6
diff --git a/trunk/drivers/w1/masters/mxc_w1.c b/trunk/drivers/w1/masters/mxc_w1.c
index 3fb6c2480d2f..53f89fa3bde6 100644
--- a/trunk/drivers/w1/masters/mxc_w1.c
+++ b/trunk/drivers/w1/masters/mxc_w1.c
@@ -134,7 +134,7 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
 
 	mdev->regs = ioremap(res->start, resource_size(res));
 	if (!mdev->regs) {
-		printk(KERN_ERR "Cannot map frame buffer registers\n");
+		dev_err(&pdev->dev, "Cannot map mxc_w1 registers\n");
 		goto failed_ioremap;
 	}