diff --git a/[refs] b/[refs]
index 0ffb3fc77bd9..34391f7a108f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6ca436e01bb25080a29bcf1382f5544ca343b4d
+refs/heads/master: ad238495fec59bdf6e1dfb119ac58b8d2d715a17
diff --git a/trunk/arch/arm/mach-at91/board-gsia18s.c b/trunk/arch/arm/mach-at91/board-gsia18s.c
index 842add7acd66..23a2fa17ab29 100644
--- a/trunk/arch/arm/mach-at91/board-gsia18s.c
+++ b/trunk/arch/arm/mach-at91/board-gsia18s.c
@@ -31,13 +31,13 @@
 #include <asm/mach/arch.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/gsia18s.h>
-#include <mach/stamp9g20.h>
 
 #include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"
+#include "gsia18s.h"
+#include "stamp9g20.h"
 
 static void __init gsia18s_init_early(void)
 {
diff --git a/trunk/arch/arm/mach-at91/board-pcontrol-g20.c b/trunk/arch/arm/mach-at91/board-pcontrol-g20.c
index 977fa7860569..0299554495dd 100644
--- a/trunk/arch/arm/mach-at91/board-pcontrol-g20.c
+++ b/trunk/arch/arm/mach-at91/board-pcontrol-g20.c
@@ -30,12 +30,12 @@
 #include <asm/mach/arch.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/stamp9g20.h>
 
 #include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"
+#include "stamp9g20.h"
 
 
 static void __init pcontrol_g20_init_early(void)
diff --git a/trunk/arch/arm/mach-at91/include/mach/gsia18s.h b/trunk/arch/arm/mach-at91/gsia18s.h
similarity index 100%
rename from trunk/arch/arm/mach-at91/include/mach/gsia18s.h
rename to trunk/arch/arm/mach-at91/gsia18s.h
diff --git a/trunk/arch/arm/mach-at91/include/mach/stamp9g20.h b/trunk/arch/arm/mach-at91/stamp9g20.h
similarity index 100%
rename from trunk/arch/arm/mach-at91/include/mach/stamp9g20.h
rename to trunk/arch/arm/mach-at91/stamp9g20.h