summaryrefslogtreecommitdiffstats
path: root/sound/pci/trident
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-28 16:49:33 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-28 16:49:33 +0100
commit6cbbfe1c8ddb6ac1322a87795dff9d8712c3e359 (patch)
treeb3c6aa438adcfdc4e9505aca81b82d9efe2eae3d /sound/pci/trident
parentALSA: sscape: add missing include of linux/io.h (diff)
downloadlinux-6cbbfe1c8ddb6ac1322a87795dff9d8712c3e359.tar.xz
linux-6cbbfe1c8ddb6ac1322a87795dff9d8712c3e359.zip
ALSA: Include linux/io.h instead of asm/io.h
Nowadays it's recommended. Replace all in a shot. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/trident')
-rw-r--r--sound/pci/trident/trident_main.c3
-rw-r--r--sound/pci/trident/trident_memory.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 2870cbf8cee0..b72be035f785 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -36,6 +36,7 @@
#include <linux/gameport.h>
#include <linux/dma-mapping.h>
#include <linux/export.h>
+#include <linux/io.h>
#include <sound/core.h>
#include <sound/info.h>
@@ -44,8 +45,6 @@
#include "trident.h"
#include <sound/asoundef.h>
-#include <asm/io.h>
-
static int snd_trident_pcm_mixer_build(struct snd_trident *trident,
struct snd_trident_voice * voice,
struct snd_pcm_substream *substream);
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c
index 04c474658e3c..b9ebb51893c5 100644
--- a/sound/pci/trident/trident_memory.c
+++ b/sound/pci/trident/trident_memory.c
@@ -23,7 +23,7 @@
*
*/
-#include <asm/io.h>
+#include <linux/io.h>
#include <linux/pci.h>
#include <linux/time.h>
#include <linux/mutex.h>