projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
[firefly-linux-kernel-4.4.55.git]
/
sound
/
core
/
pcm_memory.c
diff --git
a/sound/core/pcm_memory.c
b/sound/core/pcm_memory.c
index 54debc07f5cbb233a2249e4bf957855adbfac25b..b45f6aa322642ed6f132af0535c424a99ac39b6b 100644
(file)
--- a/
sound/core/pcm_memory.c
+++ b/
sound/core/pcm_memory.c
@@
-19,7
+19,7
@@
*
*/
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <linux/time.h>
#include <linux/init.h>
#include <linux/slab.h>