Fix remap handling by blktrace

[linux-2.6-omap-h63xx.git] / include / linux / clockchips.h

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 4ea7e7bcfafe284763f9229ecde3c16efc6d1452..e0bd46eb24145f0f855d36f3fbd35e3e3359597f 100644 (file)
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -23,6 +23,7 @@ enum clock_event_mode {
        CLOCK_EVT_MODE_SHUTDOWN,
        CLOCK_EVT_MODE_PERIODIC,
        CLOCK_EVT_MODE_ONESHOT,
+       CLOCK_EVT_MODE_RESUME,
 };
 
 /* Clock event notification values */
@@ -54,17 +55,17 @@ enum clock_event_nofitiers {
 /**
  * struct clock_event_device - clock event device descriptor
  * @name:              ptr to clock event name
- * @hints:             usage hints
+ * @features:          features
  * @max_delta_ns:      maximum delta value in ns
  * @min_delta_ns:      minimum delta value in ns
  * @mult:              nanosecond to cycles multiplier
  * @shift:             nanoseconds to cycles divisor (power of two)
  * @rating:            variable to rate clock event devices
- * @irq:               irq number (only for non cpu local devices)
- * @cpumask:           cpumask to indicate for which cpus this device works
- * @set_next_event:    set next event
+ * @irq:               IRQ number (only for non CPU local devices)
+ * @cpumask:           cpumask to indicate for which CPUs this device works
+ * @set_next_event:    set next event function
  * @set_mode:          set mode function
- * @evthandler:                Assigned by the framework to be called by the low
+ * @event_handler:     Assigned by the framework to be called by the low
  *                     level handler of the event source
  * @broadcast:         function to broadcast events
  * @list:              list head for the management code
@@ -119,10 +120,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);