---

yaml --- r: 305885 b: refs/heads/master c: 744f6f4 h: refs/heads/master i: 305883: 8f82ea6 v: v3
git-mirror · May 23, 2012 · 387167f · 387167f
1 parent 49bc6fc
commit 387167f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 101ce87b3bdd5352edceb5a079e765685c13dbc3
+refs/heads/master: 744f6f4d3db2e9f153c9381b169aaee5c6ad4187
diff --git a/trunk/drivers/watchdog/ie6xx_wdt.c b/trunk/drivers/watchdog/ie6xx_wdt.c
@@ -257,8 +257,8 @@ static int __devinit ie6xx_wdt_probe(struct platform_device *pdev)
 		return -ENODEV;
 
 	if (!request_region(res->start, resource_size(res), pdev->name)) {
-		dev_err(&pdev->dev, "Watchdog region 0x%x already in use!\n",
-			res->start);
+		dev_err(&pdev->dev, "Watchdog region 0x%llx already in use!\n",
+			(u64)res->start);
 		return -EBUSY;
 	}