From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 30 Jan 2013 17:49:30 +0000 (-0700)
Subject: clocksource: always define CLOCKSOURCE_OF_DECLARE
X-Git-Tag: v3.9-rc1~122^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d7ef1cc472de30995a50ecb9c7aa3361f985f9;p=thirdparty%2Flinux.git

clocksource: always define CLOCKSOURCE_OF_DECLARE

This allows clocksource drivers that support both DT and non-DT to
always invoke macro CLOCKSOURCE_OF_DECLARE(), rather than wrapping
it in a #ifdef CONFIG_CLKSRC_OF, which simplifies their code.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 7944f14ea9479..27cfda427dd91 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -339,6 +339,8 @@ extern void clocksource_of_init(void);
 	static const struct of_device_id __clksrc_of_table_##name	\
 		__used __section(__clksrc_of_table)			\
 		 = { .compatible = compat, .data = fn };
+#else
+#define CLOCKSOURCE_OF_DECLARE(name, compat, fn)
 #endif
 
 #endif /* _LINUX_CLOCKSOURCE_H */