diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-31 15:02:42 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 09:39:47 -0400 |
commit | 61ef19d7e771ce021edb0dff0da134b6d688d4aa (patch) | |
tree | 1835de3d87d0bc57b2acb898b9a736f70356a844 | |
parent | 9295aea1e8e00ea83965eb739b8d0bd2ea03c7cb (diff) |
ALSA: wss_lib: rename cs4231.h into wss.h
Rename file include/sound/cs4231.h
into include/sound/wss.h
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r-- | include/sound/snd_wavefront.h | 1 | ||||
-rw-r--r-- | include/sound/wss.h (renamed from include/sound/cs4231.h) | 0 | ||||
-rw-r--r-- | sound/isa/azt2320.c | 2 | ||||
-rw-r--r-- | sound/isa/cs423x/cs4231.c | 2 | ||||
-rw-r--r-- | sound/isa/cs423x/cs4236.c | 2 | ||||
-rw-r--r-- | sound/isa/cs423x/cs4236_lib.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/gusmax.c | 2 | ||||
-rw-r--r-- | sound/isa/gus/interwave.c | 2 | ||||
-rw-r--r-- | sound/isa/opl3sa2.c | 2 | ||||
-rw-r--r-- | sound/isa/opti9xx/miro.c | 2 | ||||
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 2 | ||||
-rw-r--r-- | sound/isa/sscape.c | 2 | ||||
-rw-r--r-- | sound/isa/wavefront/wavefront.c | 1 | ||||
-rw-r--r-- | sound/isa/wss/wss_lib.c | 2 |
14 files changed, 12 insertions, 12 deletions
diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h index 9688d4be918e..fa149ca77e4b 100644 --- a/include/sound/snd_wavefront.h +++ b/include/sound/snd_wavefront.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __SOUND_SND_WAVEFRONT_H__ | 1 | #ifndef __SOUND_SND_WAVEFRONT_H__ |
2 | #define __SOUND_SND_WAVEFRONT_H__ | 2 | #define __SOUND_SND_WAVEFRONT_H__ |
3 | 3 | ||
4 | #include "cs4231.h" | ||
5 | #include "mpu401.h" | 4 | #include "mpu401.h" |
6 | #include "hwdep.h" | 5 | #include "hwdep.h" |
7 | #include "rawmidi.h" | 6 | #include "rawmidi.h" |
diff --git a/include/sound/cs4231.h b/include/sound/wss.h index f0785f9f4ae4..f0785f9f4ae4 100644 --- a/include/sound/cs4231.h +++ b/include/sound/wss.h | |||
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c index 154e728f592d..a24db091d445 100644 --- a/sound/isa/azt2320.c +++ b/sound/isa/azt2320.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <linux/moduleparam.h> | 38 | #include <linux/moduleparam.h> |
39 | #include <sound/core.h> | 39 | #include <sound/core.h> |
40 | #include <sound/initval.h> | 40 | #include <sound/initval.h> |
41 | #include <sound/cs4231.h> | 41 | #include <sound/wss.h> |
42 | #include <sound/mpu401.h> | 42 | #include <sound/mpu401.h> |
43 | #include <sound/opl3.h> | 43 | #include <sound/opl3.h> |
44 | 44 | ||
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c index e9462b9944be..7da28e7c0322 100644 --- a/sound/isa/cs423x/cs4231.c +++ b/sound/isa/cs423x/cs4231.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/wait.h> | 27 | #include <linux/wait.h> |
28 | #include <linux/moduleparam.h> | 28 | #include <linux/moduleparam.h> |
29 | #include <sound/core.h> | 29 | #include <sound/core.h> |
30 | #include <sound/cs4231.h> | 30 | #include <sound/wss.h> |
31 | #include <sound/mpu401.h> | 31 | #include <sound/mpu401.h> |
32 | #include <sound/initval.h> | 32 | #include <sound/initval.h> |
33 | 33 | ||
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 4d4b8ddc26ba..246c221556e3 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/pnp.h> | 26 | #include <linux/pnp.h> |
27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
28 | #include <sound/core.h> | 28 | #include <sound/core.h> |
29 | #include <sound/cs4231.h> | 29 | #include <sound/wss.h> |
30 | #include <sound/mpu401.h> | 30 | #include <sound/mpu401.h> |
31 | #include <sound/opl3.h> | 31 | #include <sound/opl3.h> |
32 | #include <sound/initval.h> | 32 | #include <sound/initval.h> |
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index de71910401ea..eb227d856d1e 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c | |||
@@ -85,7 +85,7 @@ | |||
85 | #include <linux/time.h> | 85 | #include <linux/time.h> |
86 | #include <linux/wait.h> | 86 | #include <linux/wait.h> |
87 | #include <sound/core.h> | 87 | #include <sound/core.h> |
88 | #include <sound/cs4231.h> | 88 | #include <sound/wss.h> |
89 | #include <sound/asoundef.h> | 89 | #include <sound/asoundef.h> |
90 | 90 | ||
91 | MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); | 91 | MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); |
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index f87c6236661c..cd82891db80a 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <asm/dma.h> | 28 | #include <asm/dma.h> |
29 | #include <sound/core.h> | 29 | #include <sound/core.h> |
30 | #include <sound/gus.h> | 30 | #include <sound/gus.h> |
31 | #include <sound/cs4231.h> | 31 | #include <sound/wss.h> |
32 | #define SNDRV_LEGACY_FIND_FREE_IRQ | 32 | #define SNDRV_LEGACY_FIND_FREE_IRQ |
33 | #define SNDRV_LEGACY_FIND_FREE_DMA | 33 | #define SNDRV_LEGACY_FIND_FREE_DMA |
34 | #include <sound/initval.h> | 34 | #include <sound/initval.h> |
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index ca0d7ace0c75..eac8cc77e338 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/dma.h> | 32 | #include <asm/dma.h> |
33 | #include <sound/core.h> | 33 | #include <sound/core.h> |
34 | #include <sound/gus.h> | 34 | #include <sound/gus.h> |
35 | #include <sound/cs4231.h> | 35 | #include <sound/wss.h> |
36 | #ifdef SNDRV_STB | 36 | #ifdef SNDRV_STB |
37 | #include <sound/tea6330t.h> | 37 | #include <sound/tea6330t.h> |
38 | #endif | 38 | #endif |
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 854a9f74b466..e81cbe86823a 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/pnp.h> | 28 | #include <linux/pnp.h> |
29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
30 | #include <sound/core.h> | 30 | #include <sound/core.h> |
31 | #include <sound/cs4231.h> | 31 | #include <sound/wss.h> |
32 | #include <sound/mpu401.h> | 32 | #include <sound/mpu401.h> |
33 | #include <sound/opl3.h> | 33 | #include <sound/opl3.h> |
34 | #include <sound/initval.h> | 34 | #include <sound/initval.h> |
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 2a1e2f5d12c2..59f7c55baf30 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
33 | #include <asm/dma.h> | 33 | #include <asm/dma.h> |
34 | #include <sound/core.h> | 34 | #include <sound/core.h> |
35 | #include <sound/cs4231.h> | 35 | #include <sound/wss.h> |
36 | #include <sound/mpu401.h> | 36 | #include <sound/mpu401.h> |
37 | #include <sound/opl4.h> | 37 | #include <sound/opl4.h> |
38 | #include <sound/control.h> | 38 | #include <sound/control.h> |
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 0797ca441a37..93a03d9c7a95 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <asm/dma.h> | 34 | #include <asm/dma.h> |
35 | #include <sound/core.h> | 35 | #include <sound/core.h> |
36 | #if defined(CS4231) || defined(OPTi93X) | 36 | #if defined(CS4231) || defined(OPTi93X) |
37 | #include <sound/cs4231.h> | 37 | #include <sound/wss.h> |
38 | #else | 38 | #else |
39 | #include <sound/ad1848.h> | 39 | #include <sound/ad1848.h> |
40 | #endif /* CS4231 */ | 40 | #endif /* CS4231 */ |
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 06ad7863dff5..1dc4224b3207 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/dma.h> | 31 | #include <asm/dma.h> |
32 | #include <sound/core.h> | 32 | #include <sound/core.h> |
33 | #include <sound/hwdep.h> | 33 | #include <sound/hwdep.h> |
34 | #include <sound/cs4231.h> | 34 | #include <sound/wss.h> |
35 | #include <sound/mpu401.h> | 35 | #include <sound/mpu401.h> |
36 | #include <sound/initval.h> | 36 | #include <sound/initval.h> |
37 | 37 | ||
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c index 3a6c6fe1ec4d..2fb058b5a45f 100644 --- a/sound/isa/wavefront/wavefront.c +++ b/sound/isa/wavefront/wavefront.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <sound/core.h> | 29 | #include <sound/core.h> |
30 | #include <sound/initval.h> | 30 | #include <sound/initval.h> |
31 | #include <sound/opl3.h> | 31 | #include <sound/opl3.h> |
32 | #include <sound/wss.h> | ||
32 | #include <sound/snd_wavefront.h> | 33 | #include <sound/snd_wavefront.h> |
33 | 34 | ||
34 | MODULE_AUTHOR("Paul Barton-Davis <pbd@op.net>"); | 35 | MODULE_AUTHOR("Paul Barton-Davis <pbd@op.net>"); |
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index c5795f32ed30..549e6ab34b03 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
33 | #include <sound/core.h> | 33 | #include <sound/core.h> |
34 | #include <sound/cs4231.h> | 34 | #include <sound/wss.h> |
35 | #include <sound/pcm_params.h> | 35 | #include <sound/pcm_params.h> |
36 | 36 | ||
37 | #include <asm/io.h> | 37 | #include <asm/io.h> |