diff --git a/[refs] b/[refs]
index 16748cf3b5c9..9bc265ab306b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 143a2e54bf53216674eada16e8953f48b159e08a
+refs/heads/master: 278aefc51bdbc7f1a3d39c9bd5313c78335b7828
diff --git a/trunk/drivers/watchdog/cpwd.c b/trunk/drivers/watchdog/cpwd.c
index 0c14586f58d4..41070e4771a0 100644
--- a/trunk/drivers/watchdog/cpwd.c
+++ b/trunk/drivers/watchdog/cpwd.c
@@ -28,10 +28,9 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/uaccess.h>
 
 #include <asm/irq.h>
-#include <asm/uaccess.h>
-
 #include <asm/watchdog.h>
 
 #define DRIVER_NAME	"cpwd"
diff --git a/trunk/drivers/watchdog/riowd.c b/trunk/drivers/watchdog/riowd.c
index 2cff53310f7b..1e8f02f440e6 100644
--- a/trunk/drivers/watchdog/riowd.c
+++ b/trunk/drivers/watchdog/riowd.c
@@ -14,9 +14,8 @@
 #include <linux/watchdog.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
 
 /* RIO uses the NatSemi Super I/O power management logical device