From b8bd8d57d154a38aa05beac8011b80b58e58a151 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 27 Dec 2011 15:01:29 +0100
Subject: [PATCH] --- yaml --- r: 286917 b: refs/heads/master c:
 52ea9a7d7946c03aa1f9eeb71adb0191402724dd h: refs/heads/master i:   286915:
 a18bbdc60aebdfb448e18bfcc62fba7c01fddc4a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/watchdog/dw_wdt.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5b6b9bcae584..2f5a393425e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d32d4868ad87a5be8571b22b3d732576504dfb0
+refs/heads/master: 52ea9a7d7946c03aa1f9eeb71adb0191402724dd
diff --git a/trunk/drivers/watchdog/dw_wdt.c b/trunk/drivers/watchdog/dw_wdt.c
index 1b0e3dd81c1a..63d7b58f1c7d 100644
--- a/trunk/drivers/watchdog/dw_wdt.c
+++ b/trunk/drivers/watchdog/dw_wdt.c
@@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev)
 	if (!mem)
 		return -EINVAL;
 
-	if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
-				     "dw_wdt"))
-		return -ENOMEM;
-
-	dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+	dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);
 	if (!dw_wdt.regs)
 		return -ENOMEM;