net: fec: call dma_mapping_error() where appropriate

[karo-tx-linux.git] / drivers / watchdog / intel_scu_watchdog.c

diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c
index 9dda2d08af91a23c8ce8cb50d6f1e584212ec597..8ced2561395640cdeb16fcc679442011a230c97f 100644 (file)
--- a/drivers/watchdog/intel_scu_watchdog.c
+++ b/drivers/watchdog/intel_scu_watchdog.c
@@ -48,7 +48,7 @@
 #include <linux/atomic.h>
 #include <asm/intel_scu_ipc.h>
 #include <asm/apb_timer.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #include "intel_scu_watchdog.h"
 
@@ -445,7 +445,7 @@ static int __init intel_scu_watchdog_init(void)
         *
         * If it isn't an intel MID device then it doesn't have this watchdog
         */
-       if (!mrst_identify_cpu())
+       if (!intel_mid_identify_cpu())
                return -ENODEV;
 
        /* Check boot parameters to verify that their initial values */