diff --git a/arch/arm/include/asm/arch-rmobile/ehci-rmobile.h b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/ehci-rmobile.h
rename to arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
diff --git a/arch/arm/include/asm/arch-rmobile/gpio.h b/arch/arm/mach-rmobile/include/mach/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/gpio.h
rename to arch/arm/mach-rmobile/include/mach/gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/irqs.h b/arch/arm/mach-rmobile/include/mach/irqs.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/irqs.h
rename to arch/arm/mach-rmobile/include/mach/irqs.h
diff --git a/arch/arm/include/asm/arch-rmobile/mmc.h b/arch/arm/mach-rmobile/include/mach/mmc.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/mmc.h
rename to arch/arm/mach-rmobile/include/mach/mmc.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7740-gpio.h b/arch/arm/mach-rmobile/include/mach/r8a7740-gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7740-gpio.h
rename to arch/arm/mach-rmobile/include/mach/r8a7740-gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7740.h b/arch/arm/mach-rmobile/include/mach/r8a7740.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7740.h
rename to arch/arm/mach-rmobile/include/mach/r8a7740.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h b/arch/arm/mach-rmobile/include/mach/r8a7790-gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h
rename to arch/arm/mach-rmobile/include/mach/r8a7790-gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7790.h b/arch/arm/mach-rmobile/include/mach/r8a7790.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7790.h
rename to arch/arm/mach-rmobile/include/mach/r8a7790.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h b/arch/arm/mach-rmobile/include/mach/r8a7791-gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h
rename to arch/arm/mach-rmobile/include/mach/r8a7791-gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7791.h b/arch/arm/mach-rmobile/include/mach/r8a7791.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7791.h
rename to arch/arm/mach-rmobile/include/mach/r8a7791.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7793-gpio.h b/arch/arm/mach-rmobile/include/mach/r8a7793-gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7793-gpio.h
rename to arch/arm/mach-rmobile/include/mach/r8a7793-gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7793.h b/arch/arm/mach-rmobile/include/mach/r8a7793.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7793.h
rename to arch/arm/mach-rmobile/include/mach/r8a7793.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7794-gpio.h b/arch/arm/mach-rmobile/include/mach/r8a7794-gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7794-gpio.h
rename to arch/arm/mach-rmobile/include/mach/r8a7794-gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7794.h b/arch/arm/mach-rmobile/include/mach/r8a7794.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/r8a7794.h
rename to arch/arm/mach-rmobile/include/mach/r8a7794.h
diff --git a/arch/arm/include/asm/arch-rmobile/rcar-base.h b/arch/arm/mach-rmobile/include/mach/rcar-base.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/rcar-base.h
rename to arch/arm/mach-rmobile/include/mach/rcar-base.h
diff --git a/arch/arm/include/asm/arch-rmobile/rcar-mstp.h b/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/rcar-mstp.h
rename to arch/arm/mach-rmobile/include/mach/rcar-mstp.h
diff --git a/arch/arm/include/asm/arch-rmobile/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/rmobile.h
rename to arch/arm/mach-rmobile/include/mach/rmobile.h
diff --git a/arch/arm/include/asm/arch-rmobile/sh73a0-gpio.h b/arch/arm/mach-rmobile/include/mach/sh73a0-gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/sh73a0-gpio.h
rename to arch/arm/mach-rmobile/include/mach/sh73a0-gpio.h
diff --git a/arch/arm/include/asm/arch-rmobile/sh73a0.h b/arch/arm/mach-rmobile/include/mach/sh73a0.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/sh73a0.h
rename to arch/arm/mach-rmobile/include/mach/sh73a0.h
diff --git a/arch/arm/include/asm/arch-rmobile/sh_sdhi.h b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/sh_sdhi.h
rename to arch/arm/mach-rmobile/include/mach/sh_sdhi.h
diff --git a/arch/arm/include/asm/arch-rmobile/sys_proto.h b/arch/arm/mach-rmobile/include/mach/sys_proto.h
similarity index 100%
rename from arch/arm/include/asm/arch-rmobile/sys_proto.h
rename to arch/arm/mach-rmobile/include/mach/sys_proto.h