diff options
author | Marc Zyngier <Marc.Zyngier@arm.com> | 2015-09-28 17:49:16 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-01 03:18:38 +0300 |
commit | aad83b15aa21f2d9e46b978b27bc63989e61202d (patch) | |
tree | b8bcede56a276d9ab979bfb0c630ad3d05bb4845 /include/linux/clocksource.h | |
parent | c625f76a9910b9d51df5d6ca40a8da0684326996 (diff) | |
download | linux-aad83b15aa21f2d9e46b978b27bc63989e61202d.tar.xz |
clocksource: Add new CLKSRC_{PROBE,ACPI} config symbols
The clocksource probing infrastructure currently depends on
CONFIG_CLKSRC_OF, which depends on CONFIG_OF. In order to make
this infrastructure selectable even if CONFIG_OF is not selected,
introduce a new CONFIG_CLKSRC_PROBE (which allow the infrastructure
to be compiled in), and CONFIG_CLKSRC_ACPI (which is the pendent
of CONFIG_CLKSRC_OF for ACPI).
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/clocksource.h')
-rw-r--r-- | include/linux/clocksource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 8cde04803d91..6eab6abf89b3 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -246,7 +246,7 @@ extern int clocksource_i8253_init(void); #define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1(clksrc, name, compat, fn) -#ifdef CONFIG_CLKSRC_OF +#ifdef CONFIG_CLKSRC_PROBE extern void clocksource_of_init(void); #else static inline void clocksource_of_init(void) {} |