summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-10-03 09:30:20 +0200
committerLinus Walleij <linus.walleij@linaro.org>2011-10-03 09:34:16 +0200
commitb1e3be0647fec81887e55edbda0c56c0445f7b53 (patch)
treef45cf420afccc005b46bb24d4fc3e731b9d434ae /drivers/clocksource
parentbb219dba0d1e46324ea462ba42f6fd8e9b7471de (diff)
downloadlinux-b1e3be0647fec81887e55edbda0c56c0445f7b53.tar.gz
linux-b1e3be0647fec81887e55edbda0c56c0445f7b53.tar.bz2
linux-b1e3be0647fec81887e55edbda0c56c0445f7b53.zip
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>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/clksrc-dbx500-prcmu.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c
index 0ac5093a053a..59feefe0e3e6 100644
--- a/drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/drivers/clocksource/clksrc-dbx500-prcmu.c
@@ -31,7 +31,7 @@
#define SCHED_CLOCK_MIN_WRAP 131072 /* 2^32 / 32768 */
-void __iomem *clksrc_dbx500_timer_base;
+static void __iomem *clksrc_dbx500_timer_base;
static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs)
{
@@ -79,8 +79,10 @@ static void notrace clksrc_dbx500_prcmu_update_sched_clock(void)
}
#endif
-void __init clksrc_dbx500_prcmu_init(void)
+void __init clksrc_dbx500_prcmu_init(void __iomem *base)
{
+ clksrc_dbx500_timer_base = base;
+
/*
* The A9 sub system expects the timer to be configured as
* a continous looping timer.