Merge branches 'pm-avs' and 'pm-cpuidle'

[linux.git] / include / sound / timer.h

diff --git a/include/sound/timer.h b/include/sound/timer.h
index a53e37bcd746f24fe3354d445eda91e2efb934ba..23e885d31525a2e1bfa76da4a166438d1afaaca0 100644 (file)
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -89,7 +89,7 @@ struct snd_timer_instance {
                          unsigned long ticks, unsigned long resolution);
        void (*ccallback) (struct snd_timer_instance * timeri,
                           int event,
-                          struct timespec * tstamp,
+                          struct timespec64 * tstamp,
                           unsigned long resolution);
        void (*disconnect)(struct snd_timer_instance *timeri);
        void *callback_data;
@@ -113,7 +113,7 @@ struct snd_timer_instance {
  */
 
 int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid, struct snd_timer **rtimer);
-void snd_timer_notify(struct snd_timer *timer, int event, struct timespec *tstamp);
+void snd_timer_notify(struct snd_timer *timer, int event, struct timespec64 *tstamp);
 int snd_timer_global_new(char *id, int device, struct snd_timer **rtimer);
 int snd_timer_global_free(struct snd_timer *timer);
 int snd_timer_global_register(struct snd_timer *timer);