projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
[cascardo/linux.git]
/
include
/
sound
/
pcm.h
diff --git
a/include/sound/pcm.h
b/include/sound/pcm.h
index
b4d6697
..
d854fb3
100644
(file)
--- a/
include/sound/pcm.h
+++ b/
include/sound/pcm.h
@@
-932,7
+932,7
@@
static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime,
struct timespec *tv)
{
if (runtime->tstamp_type == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)
-
do_posix_clock_monotonic_gettime
(tv);
+
ktime_get_ts
(tv);
else
getnstimeofday(tv);
}