From: Daniel Lezcano Date: Tue, 30 May 2017 06:35:40 +0000 (+0200) Subject: clocksource/drivers: Add an alias macro CLOCKSOURCE_OF_DECLARE X-Git-Tag: v4.13-rc1~191^2~10^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b7a3b568814a8e36d2910dd74465b0215aa0a31;p=karo-tx-linux.git clocksource/drivers: Add an alias macro CLOCKSOURCE_OF_DECLARE The macro CLOCKSOURCE_OF_DECLARE has been rename to TIMER_OF_DECLARE. In order to prevent conflicts for the next merge window, a temporary alias has been added which will be removed later. Cc: Arnd Bergman Signed-off-by: Daniel Lezcano --- diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index c48ceefe0e6e..d92bd83eed9f 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -252,6 +252,9 @@ extern int clocksource_i8253_init(void); #define TIMER_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1_RET(timer, name, compat, fn) +#define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ + TIMER_OF_DECLARE(name, compat, fn) + #ifdef CONFIG_TIMER_PROBE extern void timer_probe(void); #else