diff options
| author | David S. Miller | 2019-04-17 20:26:25 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-04-17 20:26:25 +0200 |
| commit | 6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b (patch) | |
| tree | 0a7976054052e793da782c2b7ec34eccfbf66449 /include/uapi | |
| parent | Merge branch 's390-next' (diff) | |
| parent | Merge tag 'for-linus-5.1-2' of git://github.com/cminyard/linux-ipmi (diff) | |
| download | kernel-qcow2-linux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.tar.gz kernel-qcow2-linux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.tar.xz kernel-qcow2-linux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict resolution of af_smc.c from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/sound/asound.h | 1 |
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 /* |