summaryrefslogtreecommitdiffstats
path: root/include/linux/clocksource.h
diff options
context:
space:
mode:
authorMarc Zyngier <Marc.Zyngier@arm.com>2015-09-28 15:49:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-01 02:18:39 +0200
commitae281cbd2689200329afe2474b2f39f3f6eb54b9 (patch)
treeccf24acc47e81a4321491089c28b34101ced6dfb /include/linux/clocksource.h
parentaad83b15aa21f2d9e46b978b27bc63989e61202d (diff)
downloadlinux-stable-ae281cbd2689200329afe2474b2f39f3f6eb54b9.tar.gz
linux-stable-ae281cbd2689200329afe2474b2f39f3f6eb54b9.tar.bz2
linux-stable-ae281cbd2689200329afe2474b2f39f3f6eb54b9.zip
clocksource / arm_arch_timer: Convert to ACPI probing
It is now absolutely trivial to convert the arch timer driver to use ACPI probing, just like its DT counterpart. Let's enjoy another crapectomy. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@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.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 6eab6abf89b3..116645f746c1 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -252,12 +252,6 @@ extern void clocksource_of_init(void);
static inline void clocksource_of_init(void) {}
#endif
-#ifdef CONFIG_ACPI
-void acpi_generic_timer_init(void);
-#else
-static inline void acpi_generic_timer_init(void) { }
-#endif
-
#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn)