Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / pm-r8a7790.c

diff --git a/arch/arm/mach-shmobile/pm-r8a7790.c b/arch/arm/mach-shmobile/pm-r8a7790.c
index 4289b38201a88fe07502c7c62dd13ce40ee67fd2..80e8d95e54d3b8846c52f91c0d2d89f1907d6a39 100644 (file)
--- a/arch/arm/mach-shmobile/pm-r8a7790.c
+++ b/arch/arm/mach-shmobile/pm-r8a7790.c
@@ -13,9 +13,9 @@
 #include <linux/kernel.h>
 #include <linux/smp.h>
 #include <asm/io.h>
-#include <mach/r8a7790.h>
 #include "common.h"
 #include "pm-rcar.h"
+#include "r8a7790.h"
 
 /* RST */
 #define RST            0xe6160000
@@ -78,4 +78,5 @@ void __init r8a7790_pm_init(void)
        iounmap(p);
 
        r8a7790_sysc_init();
+       shmobile_smp_apmu_suspend_init();
 }