Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / watchdog / rdc321x_wdt.c

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 4733a99955ddcc2adebfa18a689bb20e6daede7a..428f8a1583e8598ae69414f8171e21a3bbbf2ba8 100644 (file)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -237,7 +237,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wdt-reg");
+       r = platform_get_resource_byname(pdev, IORESOURCE_IO, "wdt-reg");
        if (!r) {
                dev_err(&pdev->dev, "failed to get wdt-reg resource\n");
                return -ENODEV;