diff --git a/[refs] b/[refs]
index b0480121765a..23b10e4f40c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba1d28181c586deec468cc6ae558c0c099f1b956
+refs/heads/master: f7275650133ce9df83886684f3bd97373dfc21ea
diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c
index 84fa8a04eac4..7c7874e6ac36 100644
--- a/trunk/arch/sh/boards/board-ap325rxa.c
+++ b/trunk/arch/sh/boards/board-ap325rxa.c
@@ -24,7 +24,7 @@
 #include <video/sh_mobile_lcdc.h>
 #include <asm/io.h>
 #include <asm/clock.h>
-#include <asm/sh7723.h>
+#include <cpu/sh7723.h>
 
 static struct smc911x_platdata smc911x_info = {
 	.flags = SMC911X_USE_32BIT,
diff --git a/trunk/arch/sh/boards/board-magicpanelr2.c b/trunk/arch/sh/boards/board-magicpanelr2.c
index eb0e8e992c29..da6bff83a6ea 100644
--- a/trunk/arch/sh/boards/board-magicpanelr2.c
+++ b/trunk/arch/sh/boards/board-magicpanelr2.c
@@ -20,7 +20,7 @@
 #include <linux/mtd/map.h>
 #include <asm/magicpanelr2.h>
 #include <asm/heartbeat.h>
-#include <asm/sh7720.h>
+#include <cpu/sh7720.h>
 
 #define LAN9115_READY	(ctrl_inl(0xA8000084UL) & 0x00000001UL)
 
diff --git a/trunk/arch/sh/boards/mach-migor/lcd_qvga.c b/trunk/arch/sh/boards/mach-migor/lcd_qvga.c
index c283cfc2a5c3..71a40710a5aa 100644
--- a/trunk/arch/sh/boards/mach-migor/lcd_qvga.c
+++ b/trunk/arch/sh/boards/mach-migor/lcd_qvga.c
@@ -19,7 +19,7 @@
 #include <linux/module.h>
 #include <linux/gpio.h>
 #include <video/sh_mobile_lcdc.h>
-#include <asm/sh7722.h>
+#include <cpu/sh7722.h>
 #include <asm/migor.h>
 
 /* LCD Module is a PH240320T according to board schematics. This module
diff --git a/trunk/arch/sh/boards/mach-migor/setup.c b/trunk/arch/sh/boards/mach-migor/setup.c
index 3e3cc9da34ad..d00cce04d6e3 100644
--- a/trunk/arch/sh/boards/mach-migor/setup.c
+++ b/trunk/arch/sh/boards/mach-migor/setup.c
@@ -26,7 +26,7 @@
 #include <asm/io.h>
 #include <asm/sh_keysc.h>
 #include <asm/migor.h>
-#include <asm/sh7722.h>
+#include <cpu/sh7722.h>
 
 /* Address     IRQ  Size  Bus  Description
  * 0x00000000       64MB  16   NOR Flash (SP29PL256N)
diff --git a/trunk/arch/sh/include/asm/sh7203.h b/trunk/arch/sh/include/cpu-sh2a/cpu/sh7203.h
similarity index 100%
rename from trunk/arch/sh/include/asm/sh7203.h
rename to trunk/arch/sh/include/cpu-sh2a/cpu/sh7203.h
diff --git a/trunk/arch/sh/include/asm/sh7720.h b/trunk/arch/sh/include/cpu-sh3/cpu/sh7720.h
similarity index 100%
rename from trunk/arch/sh/include/asm/sh7720.h
rename to trunk/arch/sh/include/cpu-sh3/cpu/sh7720.h
diff --git a/trunk/arch/sh/include/asm/sh7722.h b/trunk/arch/sh/include/cpu-sh4/sh7722.h
similarity index 100%
rename from trunk/arch/sh/include/asm/sh7722.h
rename to trunk/arch/sh/include/cpu-sh4/sh7722.h
diff --git a/trunk/arch/sh/include/asm/sh7723.h b/trunk/arch/sh/include/cpu-sh4/sh7723.h
similarity index 100%
rename from trunk/arch/sh/include/asm/sh7723.h
rename to trunk/arch/sh/include/cpu-sh4/sh7723.h
diff --git a/trunk/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c b/trunk/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c
index b66c239509a2..9ca154627147 100644
--- a/trunk/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c
+++ b/trunk/arch/sh/kernel/cpu/sh3/pinmux-sh7720.c
@@ -11,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <asm/sh7720.h>
+#include <cpu/sh7720.h>
 
 enum {
 	PINMUX_RESERVED = 0,
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
index 51b12ab58c9e..cb9d07bd59f8 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
@@ -1,7 +1,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <asm/sh7722.h>
+#include <cpu/sh7722.h>
 
 enum {
 	PINMUX_RESERVED = 0,
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
index 92a9bc91015f..88bf5ecda849 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
@@ -11,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <asm/sh7723.h>
+#include <cpu/sh7723.h>
 
 enum {
 	PINMUX_RESERVED = 0,