From e3203ad3659008d8d25b4006a9e0917d42bc3f13 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 3 Oct 2011 09:30:20 +0200 Subject: clocksource: fixup ux500 build problems Based on a patch from Arnd Bergmann this fixes up the build problem of assigning a non-existing global when the ux500 PRCMU timer is not linked in by passing its base address to the init function. We also add a missing inclusion and staticize the dummy function. Cc: Arnd Bergmann Signed-off-by: Linus Walleij ST-Ericsson ID: 368260 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I87ec2eb27e157433fa12fb4eafc165a6217a869b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34327 Reviewed-by: QATOOLS Tested-by: Rabin VINCENT Reviewed-by: Jonas ABERG --- include/linux/clksrc-dbx500-prcmu.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/linux/clksrc-dbx500-prcmu.h b/include/linux/clksrc-dbx500-prcmu.h index d1e95042408..4fb8119c49e 100644 --- a/include/linux/clksrc-dbx500-prcmu.h +++ b/include/linux/clksrc-dbx500-prcmu.h @@ -11,12 +11,10 @@ #include #include -extern void __iomem *clksrc_dbx500_timer_base; - #ifdef CONFIG_CLKSRC_DBX500_PRCMU -void __init clksrc_dbx500_prcmu_init(void); +void __init clksrc_dbx500_prcmu_init(void __iomem *base); #else -void __init clksrc_dbx500_prcmu_init(void) {} +static inline void __init clksrc_dbx500_prcmu_init(void __iomem *base) {} #endif #endif -- cgit v1.2.3