summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-01 16:29:56 +0800
committerShawn Guo <shawn.guo@linaro.org>2013-04-01 16:29:56 +0800
commit3ed628a8122112ee796cd643e2478c4a6def234c (patch)
tree1e5e352eb501a2afa173989415a8b4896d4999a5 /include
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
parentda4a686a2cfb077a8bfc1697f597e7f86235b822 (diff)
downloadlinux-stable-3ed628a8122112ee796cd643e2478c4a6def234c.tar.gz
linux-stable-3ed628a8122112ee796cd643e2478c4a6def234c.tar.bz2
linux-stable-3ed628a8122112ee796cd643e2478c4a6def234c.zip
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'include')
-rw-r--r--include/linux/clocksource.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 27cfda427dd9..08ed5e19d8c6 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -340,6 +340,7 @@ extern void clocksource_of_init(void);
__used __section(__clksrc_of_table) \
= { .compatible = compat, .data = fn };
#else
+static inline void clocksource_of_init(void) {}
#define CLOCKSOURCE_OF_DECLARE(name, compat, fn)
#endif