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/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
sound
/
pci
/
maestro3.c
diff --git
a/sound/pci/maestro3.c
b/sound/pci/maestro3.c
index 18a60be6326695d111f0cc980a5fdf3b84d4337c..9be660993bd022bb7f662a213f6662dce1a7de98 100644
(file)
--- a/
sound/pci/maestro3.c
+++ b/
sound/pci/maestro3.c
@@
-31,7
+31,7
@@
#define CARD_NAME "ESS Maestro3/Allegro/Canyon3D-2"
#define DRIVER_NAME "Maestro3"
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/init.h>