diff --git a/[refs] b/[refs]
index 110bb14a9da1..c3d2ac403018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9659e69b0094ea2cc92716e2b1cd6a7db9caf2e
+refs/heads/master: e7b39145b54e62e9625fabb46cf591a3a06658aa
diff --git a/trunk/drivers/watchdog/at91sam9_wdt.c b/trunk/drivers/watchdog/at91sam9_wdt.c
index 5cfbcc55d88a..87445b2d72a7 100644
--- a/trunk/drivers/watchdog/at91sam9_wdt.c
+++ b/trunk/drivers/watchdog/at91sam9_wdt.c
@@ -31,7 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/uaccess.h>
 
-#include <mach/at91_wdt.h>
+#include "at91sam9_wdt.h"
 
 #define DRV_NAME "AT91SAM9 Watchdog"
 
diff --git a/trunk/arch/arm/mach-at91/include/mach/at91_wdt.h b/trunk/drivers/watchdog/at91sam9_wdt.h
similarity index 96%
rename from trunk/arch/arm/mach-at91/include/mach/at91_wdt.h
rename to trunk/drivers/watchdog/at91sam9_wdt.h
index fecc2e9f0ca8..757f9cab5c82 100644
--- a/trunk/arch/arm/mach-at91/include/mach/at91_wdt.h
+++ b/trunk/drivers/watchdog/at91sam9_wdt.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-at91/include/mach/at91_wdt.h
+ * drivers/watchdog/at91sam9_wdt.h
  *
  * Copyright (C) 2007 Andrew Victor
  * Copyright (C) 2007 Atmel Corporation.