diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
| commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
| tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /sound | |
| parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 279e24f61305..a69ebc79bc50 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | #include <linux/time.h> | 26 | #include <linux/time.h> |
| 27 | #include <linux/pm_qos.h> | 27 | #include <linux/pm_qos.h> |
| 28 | #include <linux/aio.h> | ||
| 29 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 30 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
| 31 | #include <sound/core.h> | 30 | #include <sound/core.h> |
| @@ -35,6 +34,7 @@ | |||
| 35 | #include <sound/pcm_params.h> | 34 | #include <sound/pcm_params.h> |
| 36 | #include <sound/timer.h> | 35 | #include <sound/timer.h> |
| 37 | #include <sound/minors.h> | 36 | #include <sound/minors.h> |
| 37 | #include <linux/uio.h> | ||
| 38 | 38 | ||
| 39 | /* | 39 | /* |
| 40 | * Compatibility | 40 | * Compatibility |