---

yaml --- r: 336982 b: refs/heads/master c: 128485d h: refs/heads/master v: v3
git-mirror · Nov 21, 2012 · 2ae3b6a · 2ae3b6a
1 parent fc2833b
commit 2ae3b6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}