aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/au1000.c2
-rw-r--r--sound/oss/au1550_ac97.c2
-rw-r--r--sound/oss/dmasound/dmasound_core.c10
-rw-r--r--sound/oss/ite8172.c4
-rw-r--r--sound/oss/swarm_cs4297a.c4
-rw-r--r--sound/oss/waveartist.c8
6 files changed, 15 insertions, 15 deletions
diff --git a/sound/oss/au1000.c b/sound/oss/au1000.c
index fe54de25aafc..eacb0aef21e1 100644
--- a/sound/oss/au1000.c
+++ b/sound/oss/au1000.c
@@ -100,7 +100,7 @@
100 100
101/* Boot options */ 101/* Boot options */
102static int vra = 0; // 0 = no VRA, 1 = use VRA if codec supports it 102static int vra = 0; // 0 = no VRA, 1 = use VRA if codec supports it
103MODULE_PARM(vra, "i"); 103module_param(vra, bool, 0);
104MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it"); 104MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it");
105 105
106 106
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 6a4956b8025d..c1168fae6be6 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -79,7 +79,7 @@
79 * 0 = no VRA, 1 = use VRA if codec supports it 79 * 0 = no VRA, 1 = use VRA if codec supports it
80 */ 80 */
81static int vra = 1; 81static int vra = 1;
82MODULE_PARM(vra, "i"); 82module_param(vra, bool, 0);
83MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it"); 83MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it");
84 84
85static struct au1550_state { 85static struct au1550_state {
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index c9302a1e515b..87bd3100aef3 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -195,18 +195,18 @@
195 */ 195 */
196 196
197int dmasound_catchRadius = 0; 197int dmasound_catchRadius = 0;
198MODULE_PARM(dmasound_catchRadius, "i"); 198module_param(dmasound_catchRadius, int, 0);
199 199
200static unsigned int numWriteBufs = DEFAULT_N_BUFFERS; 200static unsigned int numWriteBufs = DEFAULT_N_BUFFERS;
201MODULE_PARM(numWriteBufs, "i"); 201module_param(numWriteBufs, int, 0);
202static unsigned int writeBufSize = DEFAULT_BUFF_SIZE ; /* in bytes */ 202static unsigned int writeBufSize = DEFAULT_BUFF_SIZE ; /* in bytes */
203MODULE_PARM(writeBufSize, "i"); 203module_param(writeBufSize, int, 0);
204 204
205#ifdef HAS_RECORD 205#ifdef HAS_RECORD
206static unsigned int numReadBufs = DEFAULT_N_BUFFERS; 206static unsigned int numReadBufs = DEFAULT_N_BUFFERS;
207MODULE_PARM(numReadBufs, "i"); 207module_param(numReadBufs, int, 0);
208static unsigned int readBufSize = DEFAULT_BUFF_SIZE; /* in bytes */ 208static unsigned int readBufSize = DEFAULT_BUFF_SIZE; /* in bytes */
209MODULE_PARM(readBufSize, "i"); 209module_param(readBufSize, int, 0);
210#endif 210#endif
211 211
212MODULE_LICENSE("GPL"); 212MODULE_LICENSE("GPL");
diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index ffcb910f5c3e..00ac1c95a429 100644
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -1968,9 +1968,9 @@ static int i2s_fmt[NR_DEVICE];
1968 1968
1969static unsigned int devindex; 1969static unsigned int devindex;
1970 1970
1971MODULE_PARM(spdif, "1-" __MODULE_STRING(NR_DEVICE) "i"); 1971module_param_array(spdif, int, NULL, 0);
1972MODULE_PARM_DESC(spdif, "if 1 the S/PDIF digital output is enabled"); 1972MODULE_PARM_DESC(spdif, "if 1 the S/PDIF digital output is enabled");
1973MODULE_PARM(i2s_fmt, "1-" __MODULE_STRING(NR_DEVICE) "i"); 1973module_param_array(i2s_fmt, int, NULL, 0);
1974MODULE_PARM_DESC(i2s_fmt, "the format of I2S"); 1974MODULE_PARM_DESC(i2s_fmt, "the format of I2S");
1975 1975
1976MODULE_AUTHOR("Monta Vista Software, stevel@mvista.com"); 1976MODULE_AUTHOR("Monta Vista Software, stevel@mvista.com");
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
index dce9016cbcfd..eb5ea32fd1b0 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
@@ -154,8 +154,8 @@ static void start_adc(struct cs4297a_state *s);
154#if CSDEBUG 154#if CSDEBUG
155static unsigned long cs_debuglevel = 4; // levels range from 1-9 155static unsigned long cs_debuglevel = 4; // levels range from 1-9
156static unsigned long cs_debugmask = CS_INIT /*| CS_IOCTL*/; 156static unsigned long cs_debugmask = CS_INIT /*| CS_IOCTL*/;
157MODULE_PARM(cs_debuglevel, "i"); 157module_param(cs_debuglevel, int, 0);
158MODULE_PARM(cs_debugmask, "i"); 158module_param(cs_debugmask, int, 0);
159#endif 159#endif
160#define CS_TRUE 1 160#define CS_TRUE 1
161#define CS_FALSE 0 161#define CS_FALSE 0
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 99d04ad3ca13..afcb524a40eb 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -2028,8 +2028,8 @@ __setup("waveartist=", setup_waveartist);
2028#endif 2028#endif
2029 2029
2030MODULE_DESCRIPTION("Rockwell WaveArtist RWA-010 sound driver"); 2030MODULE_DESCRIPTION("Rockwell WaveArtist RWA-010 sound driver");
2031MODULE_PARM(io, "i"); /* IO base */ 2031module_param(io, int, 0); /* IO base */
2032MODULE_PARM(irq, "i"); /* IRQ */ 2032module_param(irq, int, 0); /* IRQ */
2033MODULE_PARM(dma, "i"); /* DMA */ 2033module_param(dma, int, 0); /* DMA */
2034MODULE_PARM(dma2, "i"); /* DMA2 */ 2034module_param(dma2, int, 0); /* DMA2 */
2035MODULE_LICENSE("GPL"); 2035MODULE_LICENSE("GPL");