diff --git a/[refs] b/[refs] index 1a1d694e1313..194bfad14557 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4e3cc387ea1b74c3ad2ef2f6f5c05fd6fc314b8 +refs/heads/master: 93da56efcf8c6a111f0349f6b7651172d4745ca0 diff --git a/trunk/include/linux/clockchips.h b/trunk/include/linux/clockchips.h index 8486e78f7335..8d7a39019ace 100644 --- a/trunk/include/linux/clockchips.h +++ b/trunk/include/linux/clockchips.h @@ -119,10 +119,6 @@ extern void clockevents_register_device(struct clock_event_device *dev); extern void clockevents_exchange_device(struct clock_event_device *old, struct clock_event_device *new); -extern -struct clock_event_device *clockevents_request_device(unsigned int features, - cpumask_t cpumask); -extern void clockevents_release_device(struct clock_event_device *dev); extern void clockevents_set_mode(struct clock_event_device *dev, enum clock_event_mode mode); extern int clockevents_register_notifier(struct notifier_block *nb);