diff --git a/[refs] b/[refs] index 0aead9eacf3f..637968ec18bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80debae58435423def63632273139ee5fcb99c69 +refs/heads/master: e1d7ef1cc472de30995a50ecb9c7aa3361f985f9 diff --git a/trunk/include/linux/clocksource.h b/trunk/include/linux/clocksource.h index 7944f14ea947..27cfda427dd9 100644 --- a/trunk/include/linux/clocksource.h +++ b/trunk/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 */