ARM: EXYNOS: local regs-pmu.h header file

This moves regs-pmu.h file into mach-exynos directory.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 61d2906..1fc0424 100644 (file)
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -38,13 +38,14 @@
 #include <asm/cacheflush.h>
 
 #include <mach/regs-irq.h>
-#include <mach/regs-pmu.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
 #include <plat/regs-serial.h>
 
 #include "common.h"
+#include "regs-pmu.h"
+
 #define L2_AUX_VAL 0x7C470001
 #define L2_AUX_MASK 0xC200ffff
 

diff --cc arch/arm/mach-exynos/cpuidle.c
Simple merge

diff --cc arch/arm/mach-exynos/hotplug.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge

diff --cc arch/arm/mach-exynos/pm.c
Simple merge

diff --cc arch/arm/mach-exynos/pm_domains.c
Simple merge

diff --cc arch/arm/mach-exynos/pmu.c
Simple merge