Merge tag 'v4.0' into for_next

[deliverable/linux.git] / sound / isa / opti9xx / miro.c

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 546452888aed4c61f7e909231a70c5f932d22caa..3a9067db1a842605518c70eabf84f5691413db00 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -29,7 +29,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/dma.h>
 #include <sound/core.h>
 #include <sound/wss.h>