Merge 3.3-rc2 into the driver-core-next branch.

This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index b8ef2c6dca7c..c44c3334003a 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -247,7 +247,6 @@ static struct miscdevice imx2_wdt_miscdev = {
 static int __init imx2_wdt_probe(struct platform_device *pdev)
 {
         int ret;
-        int res_size;
         struct resource *res;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -256,15 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        res_size = resource_size(res);
-        if (!devm_request_mem_region(&pdev->dev, res->start, res_size,
-                res->name)) {
-                dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",
-                        res_size, res->start);
-                return -ENOMEM;
-        }
-
-        imx2_wdt.base = devm_ioremap_nocache(&pdev->dev, res->start, res_size);
+        imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);
         if (!imx2_wdt.base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 return -ENOMEM;