diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-28 10:49:33 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-28 10:49:33 -0500 |
commit | 6cbbfe1c8ddb6ac1322a87795dff9d8712c3e359 (patch) | |
tree | b3c6aa438adcfdc4e9505aca81b82d9efe2eae3d /sound/pci/trident | |
parent | 37419584abbb3abf3fae6b9eb6869f18c95f6a1d (diff) |
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.c | 3 | ||||
-rw-r--r-- | sound/pci/trident/trident_memory.c | 2 |
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 @@ | |||
36 | #include <linux/gameport.h> | 36 | #include <linux/gameport.h> |
37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
38 | #include <linux/export.h> | 38 | #include <linux/export.h> |
39 | #include <linux/io.h> | ||
39 | 40 | ||
40 | #include <sound/core.h> | 41 | #include <sound/core.h> |
41 | #include <sound/info.h> | 42 | #include <sound/info.h> |
@@ -44,8 +45,6 @@ | |||
44 | #include "trident.h" | 45 | #include "trident.h" |
45 | #include <sound/asoundef.h> | 46 | #include <sound/asoundef.h> |
46 | 47 | ||
47 | #include <asm/io.h> | ||
48 | |||
49 | static int snd_trident_pcm_mixer_build(struct snd_trident *trident, | 48 | static int snd_trident_pcm_mixer_build(struct snd_trident *trident, |
50 | struct snd_trident_voice * voice, | 49 | struct snd_trident_voice * voice, |
51 | struct snd_pcm_substream *substream); | 50 | 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 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <asm/io.h> | 26 | #include <linux/io.h> |
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | #include <linux/time.h> | 28 | #include <linux/time.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |