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 <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]> --- include/linux/clocksource.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index c48ceef..d92bd83 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 -- 2.7.4
