diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 11:30:20 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 11:34:16 +0400 |
| commit | b1e3be0647fec81887e55edbda0c56c0445f7b53 (patch) | |
| tree | f45cf420afccc005b46bb24d4fc3e731b9d434ae /include/linux | |
| parent | bb219dba0d1e46324ea462ba42f6fd8e9b7471de (diff) | |
| download | linux-b1e3be0647fec81887e55edbda0c56c0445f7b53.tar.xz | |
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 'include/linux')
| -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 d1e95042408b..4fb8119c49e4 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 |