diff --git a/[refs] b/[refs]
index f81958c97ac2..1bde7746e1de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7766e16beec3363516306754c9c51a85747d734d
+refs/heads/master: 2d2bcd319a3d1412999cdfc72ad64eec992dc37e
diff --git a/trunk/arch/sh/boot/romimage/head.S b/trunk/arch/sh/boot/romimage/head.S
index 97a087bc9c4a..219bc626dd71 100644
--- a/trunk/arch/sh/boot/romimage/head.S
+++ b/trunk/arch/sh/boot/romimage/head.S
@@ -7,4 +7,4 @@
 .text
 	.global	romstart
 romstart:
-#include <romimage.h>
+#include <mach/romimage.h>
diff --git a/trunk/arch/sh/include/mach-common/romimage.h b/trunk/arch/sh/include/mach-common/mach/romimage.h
similarity index 100%
rename from trunk/arch/sh/include/mach-common/romimage.h
rename to trunk/arch/sh/include/mach-common/mach/romimage.h
diff --git a/trunk/arch/sh/include/mach-kfr2r09/partner-jet-setup.txt b/trunk/arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt
similarity index 100%
rename from trunk/arch/sh/include/mach-kfr2r09/partner-jet-setup.txt
rename to trunk/arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt
diff --git a/trunk/arch/sh/include/mach-kfr2r09/romimage.h b/trunk/arch/sh/include/mach-kfr2r09/mach/romimage.h
similarity index 100%
rename from trunk/arch/sh/include/mach-kfr2r09/romimage.h
rename to trunk/arch/sh/include/mach-kfr2r09/mach/romimage.h