diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 09:30:20 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-18 13:04:04 +0200 |
| commit | e3203ad3659008d8d25b4006a9e0917d42bc3f13 (patch) | |
| tree | 9f099f2cf32918ca75ec69b50f4618aec9146b1a /include | |
| parent | 4e200f9409e9015889177197c3ff4f577b7cb724 (diff) | |
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 <linux/errno.h> inclusion and
staticize the dummy function.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
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 <rabin.vincent@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clksrc-dbx500-prcmu.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 <linux/init.h> #include <linux/io.h> -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 |