diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-25 17:01:14 +0200 |
| commit | cf81d6b583444cb6f5e656f050e43413b236354e (patch) | |
| tree | 646567ef019e0bbc5cc9db0e26c464a9fc239481 /sound/core/seq/seq_timer.h | |
| parent | ALSA: usb-audio: Fix quirks code is not called (diff) | |
| parent | ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members (diff) | |
| download | linux-dev-cf81d6b583444cb6f5e656f050e43413b236354e.tar.xz linux-dev-cf81d6b583444cb6f5e656f050e43413b236354e.zip | |
Merge branch 'for-next' into for-linus
Merged 4.8 changes.
Diffstat (limited to 'sound/core/seq/seq_timer.h')
| -rw-r--r-- | sound/core/seq/seq_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h index 88dfb71805ae..9506b661fe5b 100644 --- a/sound/core/seq/seq_timer.h +++ b/sound/core/seq/seq_timer.h @@ -52,7 +52,7 @@ struct snd_seq_timer { unsigned int skew; unsigned int skew_base; - struct timeval last_update; /* time of last clock update, used for interpolation */ + struct timespec64 last_update; /* time of last clock update, used for interpolation */ spinlock_t lock; }; |