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-3.10' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
sound
/
core
/
pcm_native.c
diff --git
a/sound/core/pcm_native.c
b/sound/core/pcm_native.c
index 23e3c46cd0a4eda841d66d0fd637e55e88397564..ccfa383f1fda33d5cd8e4d6ed16e42ed875cc5a1 100644
(file)
--- a/
sound/core/pcm_native.c
+++ b/
sound/core/pcm_native.c
@@
-25,7
+25,7
@@
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/pm_qos.h>
-#include <linux/
u
io.h>
+#include <linux/
a
io.h>
#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/control.h>