summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-04-13 11:09:40 +0300
committerTakashi Iwai <tiwai@suse.de>2019-04-13 11:09:46 +0300
commit99fff44fe339b21c6a4ddd6c1239e587dd439cd3 (patch)
tree132e59f06c467786f21b9b67a5a031936850b384 /include/uapi
parent6b580f523172f2c738b661069a57c23c74a75f88 (diff)
parent183ab39eb0ea9879bb68422a83e65f750f3192f0 (diff)
downloadlinux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.tar.xz
Merge branch 'for-linus' into for-next
Back-merge the 5.1 devel branch for the further HD-audio development. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/sound/asound.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index 404d4b9ffe76..df1153cea0b7 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -32,6 +32,7 @@
#ifndef __KERNEL__
#include <stdlib.h>
+#include <time.h>
#endif
/*