summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/pm/context.c1
-rw-r--r--arch/arm/mach-ux500/prcmu-debug.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/pm/context.c b/arch/arm/mach-ux500/pm/context.c
index 7ff2c5bf2ff..3bfb3acf8c9 100644
--- a/arch/arm/mach-ux500/pm/context.c
+++ b/arch/arm/mach-ux500/pm/context.c
@@ -686,7 +686,6 @@ void context_gpio_mux_safe_switch(bool begin)
{
int i;
- static u32 slpc[GPIO_NUM_BANKS];
static u32 rwimsc[GPIO_NUM_BANKS];
static u32 fwimsc[GPIO_NUM_BANKS];
diff --git a/arch/arm/mach-ux500/prcmu-debug.h b/arch/arm/mach-ux500/prcmu-debug.h
index c536aed1f6b..79e03e5b208 100644
--- a/arch/arm/mach-ux500/prcmu-debug.h
+++ b/arch/arm/mach-ux500/prcmu-debug.h
@@ -18,6 +18,6 @@ int prcmu_debug_init(void);
#else
static inline void prcmu_debug_ape_opp_log(u8 opp) {}
static inline void prcmu_debug_ddr_opp_log(u8 opp) {}
-static inline int prcmu_debug_init(void) {}
+static inline int prcmu_debug_init(void) {return 0;}
#endif
#endif