Merge tag 'mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/daveh/x86-mpx

[linux.git] / drivers / watchdog / rc32434_wdt.c

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index 1dfede0abf18e93a46a8965b00f1e236ae838823..aee3c2efd565e7fa46ecc13816551d0d9f4c8a80 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>     /* For platform_driver framework */
 #include <linux/spinlock.h>            /* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>             /* For copy_to_user/put_user/... */
-#include <linux/io.h>                  /* For devm_ioremap_nocache */
+#include <linux/io.h>                  /* For devm_ioremap */
 
 #include <asm/mach-rc32434/integ.h>    /* For the Watchdog registers */
 
@@ -267,7 +267,7 @@ static int rc32434_wdt_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       wdt_reg = devm_ioremap_nocache(&pdev->dev, r->start, resource_size(r));
+       wdt_reg = devm_ioremap(&pdev->dev, r->start, resource_size(r));
        if (!wdt_reg) {
                pr_err("failed to remap I/O resources\n");
                return -ENXIO;