aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-msm/board-dt-8660.c1
-rw-r--r--arch/arm/mach-msm/board-dt-8960.c1
-rw-r--r--arch/arm/mach-msm/common.h2
-rw-r--r--arch/arm/mach-msm/hotplug.c2
-rw-r--r--arch/arm/mach-msm/platsmp.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c
index e5643f629dcd..b5b4de2cdf9e 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -20,7 +20,6 @@
20 20
21#include <mach/board.h> 21#include <mach/board.h>
22#include "common.h" 22#include "common.h"
23#include "core.h"
24 23
25static const struct of_device_id msm_dt_gic_match[] __initconst = { 24static const struct of_device_id msm_dt_gic_match[] __initconst = {
26 { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init }, 25 { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },
diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c
index 139d61bbc8e7..4490edb71c17 100644
--- a/arch/arm/mach-msm/board-dt-8960.c
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -18,7 +18,6 @@
18#include <asm/mach/arch.h> 18#include <asm/mach/arch.h>
19 19
20#include "common.h" 20#include "common.h"
21#include "core.h"
22 21
23static const struct of_device_id msm_dt_gic_match[] __initconst = { 22static const struct of_device_id msm_dt_gic_match[] __initconst = {
24 { .compatible = "qcom,msm-qgic2", .data = gic_of_init }, 23 { .compatible = "qcom,msm-qgic2", .data = gic_of_init },
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index d68e5d7854f5..633a7159d5ff 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -26,5 +26,7 @@ extern void msm_map_qsd8x50_io(void);
26extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, 26extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
27 unsigned int mtype, void *caller); 27 unsigned int mtype, void *caller);
28 28
29extern struct smp_operations msm_smp_ops;
30extern void msm_cpu_die(unsigned int cpu);
29 31
30#endif 32#endif
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index 002ac1e47235..750446feb444 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -13,7 +13,7 @@
13#include <asm/cacheflush.h> 13#include <asm/cacheflush.h>
14#include <asm/smp_plat.h> 14#include <asm/smp_plat.h>
15 15
16#include "core.h" 16#include "common.h"
17 17
18static inline void cpu_enter_lowpower(void) 18static inline void cpu_enter_lowpower(void)
19{ 19{
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 637021c0d8af..7ed69b69c87c 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -23,7 +23,7 @@
23#include <asm/smp_plat.h> 23#include <asm/smp_plat.h>
24 24
25#include "scm-boot.h" 25#include "scm-boot.h"
26#include "core.h" 26#include "common.h"
27 27
28#define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0 28#define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
29#define SCSS_CPU1CORE_RESET 0xD80 29#define SCSS_CPU1CORE_RESET 0xD80