Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: multisound.sh: update module namespace

The modules for the cards described here changed their names.
Update accordingly.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Mauro Carvalho Chehab and committed by
Takashi Iwai
513f9306 06501a6d

+36 -36
+36 -36
Documentation/sound/cards/multisound.sh
··· 34 34 # composed of the following modules (these can also operate compiled 35 35 # into the kernel): 36 36 # 37 - # msnd - MultiSound base (requires soundcore) 37 + # snd-msnd-lib - MultiSound base (requires snd) 38 38 # 39 - # msnd_classic - Base audio/mixer support for Classic, Monetery and 40 - # Tahiti cards 39 + # snd-msnd-classic - Base audio/mixer support for Classic, Monetery and 40 + # Tahiti cards 41 41 # 42 - # msnd_pinnacle - Base audio/mixer support for Pinnacle and Fiji cards 42 + # snd-msnd-pinnacle - Base audio/mixer support for Pinnacle and Fiji cards 43 43 # 44 44 # 45 45 # Important Notes - Read Before Using ··· 66 66 # 67 67 # * Classic/Monterey/Tahiti 68 68 # 69 - # These cards are configured through the driver msnd_classic. You must 69 + # These cards are configured through the driver snd-msnd-classic. You must 70 70 # know the io port, then the driver will select the irq and memory resources 71 71 # on the card. It is up to you to know if these are free locations or now, 72 72 # a conflict can lock the machine up. ··· 81 81 # can be used to configure the card in non-PnP mode, and in PnP mode 82 82 # you can use isapnptools. These are described briefly here. 83 83 # 84 - # pinnaclecfg is not required; you can use the msnd_pinnacle module 84 + # pinnaclecfg is not required; you can use the snd-msnd-pinnacle module 85 85 # to fully configure the card as well. However, pinnaclecfg can be 86 86 # used to change the resource values of a particular device after the 87 - # msnd_pinnacle module has been loaded. If you are compiling the 87 + # snd-msnd-pinnacle module has been loaded. If you are compiling the 88 88 # driver into the kernel, you must set these values during compile 89 89 # time, however other peripheral resource values can be changed with 90 90 # the pinnaclecfg program after the kernel is loaded. ··· 96 96 # to obtain one with the command `pnpdump 1 0x203' -- this may vary 97 97 # for you (running pnpdump by itself did not work for me). Then, 98 98 # edit this file and use isapnp to uncomment and set the card values. 99 - # Use these values when inserting the msnd_pinnacle module. Using 99 + # Use these values when inserting the snd-msnd-pinnacle module. Using 100 100 # this method, you can set the resources for the DSP and the Kurzweil 101 101 # synth (Pinnacle). Since Linux does not directly support PnP 102 102 # devices, you may have difficulty when using the card in PnP mode ··· 133 133 # pinnaclecfg program. Using this program, you can assign the 134 134 # resource values to the card's devices, or disable the devices. As 135 135 # an alternative to using pinnaclecfg, you can specify many of the 136 - # configuration values when loading the msnd_pinnacle module (or 136 + # configuration values when loading the snd-msnd-pinnacle module (or 137 137 # during kernel configuration when compiling the driver into the 138 138 # kernel). 139 139 # 140 - # If you specify cfg=0x250 for the msnd_pinnacle module, it 140 + # If you specify cfg=0x250 for the snd-msnd-pinnacle module, it 141 141 # automatically configure the card to the given io, irq and memory 142 142 # values using that config port (the config port is jumper selectable 143 143 # on the card to 0x250, 0x260 or 0x270). 144 144 # 145 - # See the `msnd_pinnacle Additional Options' section below for more 145 + # See the `snd-msnd-pinnacle Additional Options' section below for more 146 146 # information on these parameters (also, if you compile the driver 147 147 # directly into the kernel, these extra parameters can be useful 148 148 # here). ··· 157 157 # 158 158 # * MultiSound Classic/Monterey/Tahiti: 159 159 # 160 - # modprobe soundcore 161 - # insmod msnd 162 - # insmod msnd_classic io=0x290 irq=7 mem=0xd0000 160 + # modprobe snd 161 + # insmod snd-msnd-lib 162 + # insmod snd-msnd-classic io=0x290 irq=7 mem=0xd0000 163 163 # 164 164 # * MultiSound Pinnacle in PnP mode: 165 165 # 166 - # modprobe soundcore 167 - # insmod msnd 166 + # modprobe snd 167 + # insmod snd-msnd-lib 168 168 # isapnp mypinnacle.conf 169 - # insmod msnd_pinnacle io=0x210 irq=5 mem=0xd8000 <-- match mypinnacle.conf values 169 + # insmod snd-msnd-pinnacle io=0x210 irq=5 mem=0xd8000 <-- match mypinnacle.conf values 170 170 # 171 171 # * MultiSound Pinnacle in non-PnP mode (replace 0x250 with your configuration port, 172 172 # one of 0x250, 0x260 or 0x270): 173 173 # 174 - # insmod soundcore 175 - # insmod msnd 176 - # insmod msnd_pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 174 + # modprobe snd 175 + # insmod snd-msnd-lib 176 + # insmod snd-msnd-pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 177 177 # 178 178 # * To use the MPU-compatible Kurzweil synth on the Pinnacle in PnP 179 179 # mode, add the following (assumes you did `isapnp mypinnacle.conf'): 180 180 # 181 - # insmod sound 181 + # insmod snd 182 182 # insmod mpu401 io=0x330 irq=9 <-- match mypinnacle.conf values 183 183 # 184 184 # * To use the MPU-compatible Kurzweil synth on the Pinnacle in non-PnP 185 185 # mode, add the following. Note how we first configure the peripheral's 186 186 # resources, _then_ install a Linux driver for it: 187 187 # 188 - # insmod sound 188 + # insmod snd 189 189 # pinnaclecfg 0x250 mpu 0x330 9 190 190 # insmod mpu401 io=0x330 irq=9 191 191 # 192 192 # -- OR you can use the following sequence without pinnaclecfg in non-PnP mode: 193 193 # 194 - # insmod soundcore 195 - # insmod msnd 196 - # insmod msnd_pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 mpu_io=0x330 mpu_irq=9 197 - # insmod sound 194 + # modprobe snd 195 + # insmod snd-msnd-lib 196 + # insmod snd-msnd-pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 mpu_io=0x330 mpu_irq=9 197 + # insmod snd 198 198 # insmod mpu401 io=0x330 irq=9 199 199 # 200 200 # * To setup the joystick port on the Pinnacle in non-PnP mode (though ··· 203 203 # 204 204 # pinnaclecfg 0x250 joystick 0x200 205 205 # 206 - # -- OR you can configure this using msnd_pinnacle with the following: 206 + # -- OR you can configure this using snd-msnd-pinnacle with the following: 207 207 # 208 - # insmod soundcore 209 - # insmod msnd 210 - # insmod msnd_pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 joystick_io=0x200 208 + # modprobe snd 209 + # insmod snd-msnd-lib 210 + # insmod snd-msnd-pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 joystick_io=0x200 211 211 # 212 212 # 213 - # msnd_classic, msnd_pinnacle Required Options 214 - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 213 + # snd-msnd-classic, snd-msnd-pinnacle Required Options 214 + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 215 215 # 216 216 # If the following options are not given, the module will not load. 217 217 # Examine the kernel message log for informative error messages. ··· 223 223 # mem Shared memory area, e.g. mem=0xd8000 224 224 # 225 225 # 226 - # msnd_classic, msnd_pinnacle Additional Options 227 - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 226 + # snd-msnd-classic, snd-msnd-pinnacle Additional Options 227 + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 228 228 # 229 229 # fifosize The digital audio FIFOs, in kilobytes. If not 230 230 # specified, the default will be used. Increasing ··· 244 244 # to zero). 245 245 # 246 246 # 247 - # msnd_pinnacle Additional Options 248 - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 247 + # snd-msnd-pinnacle Additional Options 248 + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 249 249 # 250 250 # digital Specify digital=1 to enable the S/PDIF input 251 251 # if you have the digital daughterboard