1 files changed, 12 insertions, 10 deletions

diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index aaaaf6e8b706..6683072a9d98 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -24,12 +24,14 @@
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a73a4.h>
+
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a73a4.h"
+
 static const struct resource pfc_resources[] = {
         DEFINE_RES_MEM(0xe6050000, 0x9000),
 };
@@ -187,12 +189,6 @@ static struct resource cmt1_resources[] = {
 
 void __init r8a73a4_add_dt_devices(void)
 {
-        r8a73a4_register_scif(0);
-        r8a73a4_register_scif(1);
-        r8a73a4_register_scif(2);
-        r8a73a4_register_scif(3);
-        r8a73a4_register_scif(4);
-        r8a73a4_register_scif(5);
         r8a7790_register_cmt(1);
 }
 
@@ -287,6 +283,12 @@ static struct resource dma_resources[] = {
 void __init r8a73a4_add_standard_devices(void)
 {
         r8a73a4_add_dt_devices();
+        r8a73a4_register_scif(0);
+        r8a73a4_register_scif(1);
+        r8a73a4_register_scif(2);
+        r8a73a4_register_scif(3);
+        r8a73a4_register_scif(4);
+        r8a73a4_register_scif(5);
         r8a73a4_register_irqc(0);
         r8a73a4_register_irqc(1);
         r8a73a4_register_thermal();