Commit 8556b8e6 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix sound kconfig file locations

parent 72f28cec
...@@ -156,7 +156,7 @@ config SOUND_ES1370 ...@@ -156,7 +156,7 @@ config SOUND_ES1370
1274:5000. Since Ensoniq was bought by Creative Labs, 1274:5000. Since Ensoniq was bought by Creative Labs,
Sound Blaster 64/PCI models are either ES1370 or ES1371 based. Sound Blaster 64/PCI models are either ES1370 or ES1371 based.
This driver differs slightly from OSS/Free, so PLEASE READ This driver differs slightly from OSS/Free, so PLEASE READ
<file:Documentation/sound/es1370>. <file:Documentation/sound/oss/es1370>.
config SOUND_ES1371 config SOUND_ES1371
tristate "Creative Ensoniq AudioPCI 97 (ES1371)" tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
...@@ -180,7 +180,7 @@ config SOUND_ESSSOLO1 ...@@ -180,7 +180,7 @@ config SOUND_ESSSOLO1
Solo1 chip without removing your computer's cover, use Solo1 chip without removing your computer's cover, use
lspci -n and look for the PCI ID 125D:1969. This driver lspci -n and look for the PCI ID 125D:1969. This driver
differs slightly from OSS/Free, so PLEASE READ differs slightly from OSS/Free, so PLEASE READ
<file:Documentation/sound/solo1>. <file:Documentation/sound/oss/solo1>.
config SOUND_MAESTRO config SOUND_MAESTRO
tristate "ESS Maestro, Maestro2, Maestro2E driver" tristate "ESS Maestro, Maestro2, Maestro2E driver"
...@@ -188,7 +188,7 @@ config SOUND_MAESTRO ...@@ -188,7 +188,7 @@ config SOUND_MAESTRO
help help
Say Y or M if you have a sound system driven by ESS's Maestro line Say Y or M if you have a sound system driven by ESS's Maestro line
of PCI sound chips. These include the Maestro 1, Maestro 2, and of PCI sound chips. These include the Maestro 1, Maestro 2, and
Maestro 2E. See <file:Documentation/sound/Maestro> for more Maestro 2E. See <file:Documentation/sound/oss/Maestro> for more
details. details.
config SOUND_MAESTRO3 config SOUND_MAESTRO3
...@@ -221,7 +221,7 @@ config SOUND_SONICVIBES ...@@ -221,7 +221,7 @@ config SOUND_SONICVIBES
SonicVibes chip without removing your computer's cover, use SonicVibes chip without removing your computer's cover, use
lspci -n and look for the PCI ID 5333:CA00. This driver lspci -n and look for the PCI ID 5333:CA00. This driver
differs slightly from OSS/Free, so PLEASE READ differs slightly from OSS/Free, so PLEASE READ
<file:Documentation/sound/sonicvibes>. <file:Documentation/sound/oss/sonicvibes>.
config SOUND_VWSND config SOUND_VWSND
tristate "SGI Visual Workstation Sound" tristate "SGI Visual Workstation Sound"
...@@ -229,7 +229,7 @@ config SOUND_VWSND ...@@ -229,7 +229,7 @@ config SOUND_VWSND
help help
Say Y or M if you have an SGI Visual Workstation and you want to be Say Y or M if you have an SGI Visual Workstation and you want to be
able to use its on-board audio. Read able to use its on-board audio. Read
<file:Documentation/sound/vwsnd> for more info on this driver's <file:Documentation/sound/oss/vwsnd> for more info on this driver's
capabilities. capabilities.
config SOUND_VRC5477 config SOUND_VRC5477
...@@ -284,7 +284,7 @@ config SOUND_MSNDCLAS ...@@ -284,7 +284,7 @@ config SOUND_MSNDCLAS
Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
Monterey (not for the Pinnacle or Fiji). Monterey (not for the Pinnacle or Fiji).
See <file:Documentation/sound/MultiSound> for important information See <file:Documentation/sound/oss/MultiSound> for important information
about this driver. Note that it has been discontinued, but the about this driver. Note that it has been discontinued, but the
Voyetra Turtle Beach knowledge base entry for it is still available Voyetra Turtle Beach knowledge base entry for it is still available
at <http://www.voyetra-turtle-beach.com/site/kb_ftp/790.asp>. at <http://www.voyetra-turtle-beach.com/site/kb_ftp/790.asp>.
...@@ -293,7 +293,7 @@ comment "Compiled-in MSND Classic support requires firmware during compilation." ...@@ -293,7 +293,7 @@ comment "Compiled-in MSND Classic support requires firmware during compilation."
depends on SOUND_PRIME && SOUND_MSNDCLAS=y depends on SOUND_PRIME && SOUND_MSNDCLAS=y
config MSNDCLAS_HAVE_BOOT config MSNDCLAS_HAVE_BOOT
bool bool "Have MSNDINIT.BIN firmware file"
depends on SOUND_MSNDCLAS=y depends on SOUND_MSNDCLAS=y
default y default y
...@@ -305,7 +305,7 @@ config MSNDCLAS_INIT_FILE ...@@ -305,7 +305,7 @@ config MSNDCLAS_INIT_FILE
The MultiSound cards have two firmware files which are required for The MultiSound cards have two firmware files which are required for
operation, and are not currently included. These files can be operation, and are not currently included. These files can be
obtained from Turtle Beach. See obtained from Turtle Beach. See
<file:Documentation/sound/MultiSound> for information on how to <file:Documentation/sound/oss/MultiSound> for information on how to
obtain this. obtain this.
config MSNDCLAS_PERM_FILE config MSNDCLAS_PERM_FILE
...@@ -316,7 +316,7 @@ config MSNDCLAS_PERM_FILE ...@@ -316,7 +316,7 @@ config MSNDCLAS_PERM_FILE
The MultiSound cards have two firmware files which are required for The MultiSound cards have two firmware files which are required for
operation, and are not currently included. These files can be operation, and are not currently included. These files can be
obtained from Turtle Beach. See obtained from Turtle Beach. See
<file:Documentation/sound/MultiSound> for information on how to <file:Documentation/sound/oss/MultiSound> for information on how to
obtain this. obtain this.
config MSNDCLAS_IRQ config MSNDCLAS_IRQ
...@@ -346,7 +346,7 @@ config SOUND_MSNDPIN ...@@ -346,7 +346,7 @@ config SOUND_MSNDPIN
depends on SOUND_PRIME!=n && SOUND depends on SOUND_PRIME!=n && SOUND
help help
Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji. Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.
See <file:Documentation/sound/MultiSound> for important information See <file:Documentation/sound/oss/MultiSound> for important information
about this driver. Note that it has been discontinued, but the about this driver. Note that it has been discontinued, but the
Voyetra Turtle Beach knowledge base entry for it is still available Voyetra Turtle Beach knowledge base entry for it is still available
at <http://www.voyetra-turtle-beach.com/site/kb_ftp/600.asp>. at <http://www.voyetra-turtle-beach.com/site/kb_ftp/600.asp>.
...@@ -355,7 +355,7 @@ comment "Compiled-in MSND Pinnacle support requires firmware during compilation. ...@@ -355,7 +355,7 @@ comment "Compiled-in MSND Pinnacle support requires firmware during compilation.
depends on SOUND_PRIME && SOUND_MSNDPIN=y depends on SOUND_PRIME && SOUND_MSNDPIN=y
config MSNDPIN_HAVE_BOOT config MSNDPIN_HAVE_BOOT
bool bool "Have PNDSPINI.BIN firmware file"
depends on SOUND_MSNDPIN=y depends on SOUND_MSNDPIN=y
default y default y
...@@ -367,7 +367,7 @@ config MSNDPIN_INIT_FILE ...@@ -367,7 +367,7 @@ config MSNDPIN_INIT_FILE
The MultiSound cards have two firmware files which are required The MultiSound cards have two firmware files which are required
for operation, and are not currently included. These files can be for operation, and are not currently included. These files can be
obtained from Turtle Beach. See obtained from Turtle Beach. See
<file:Documentation/sound/MultiSound> for information on how to <file:Documentation/sound/oss/MultiSound> for information on how to
obtain this. obtain this.
config MSNDPIN_PERM_FILE config MSNDPIN_PERM_FILE
...@@ -378,7 +378,7 @@ config MSNDPIN_PERM_FILE ...@@ -378,7 +378,7 @@ config MSNDPIN_PERM_FILE
The MultiSound cards have two firmware files which are required for The MultiSound cards have two firmware files which are required for
operation, and are not currently included. These files can be operation, and are not currently included. These files can be
obtained from Turtle Beach. See obtained from Turtle Beach. See
<file:Documentation/sound/MultiSound> for information on how to <file:Documentation/sound/oss/MultiSound> for information on how to
obtain this. obtain this.
config MSNDPIN_IRQ config MSNDPIN_IRQ
...@@ -412,7 +412,7 @@ config MSNDPIN_DIGITAL ...@@ -412,7 +412,7 @@ config MSNDPIN_DIGITAL
If you have the S/PDIF daughter board for the Pinnacle or Fiji, If you have the S/PDIF daughter board for the Pinnacle or Fiji,
answer Y here; otherwise, say N. If you have this, you will be able answer Y here; otherwise, say N. If you have this, you will be able
to play and record from the S/PDIF port (digital signal). See to play and record from the S/PDIF port (digital signal). See
<file:Documentation/sound/MultiSound> for information on how to make <file:Documentation/sound/oss/MultiSound> for information on how to make
use of this capability. use of this capability.
config MSNDPIN_NONPNP config MSNDPIN_NONPNP
...@@ -613,7 +613,7 @@ config SOUND_CS4232 ...@@ -613,7 +613,7 @@ config SOUND_CS4232
"cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
command line. command line.
See <file:Documentation/sound/CS4232> for more information on See <file:Documentation/sound/oss/CS4232> for more information on
configuring this card. configuring this card.
config SOUND_SSCAPE config SOUND_SSCAPE
...@@ -633,7 +633,7 @@ config SOUND_GUS ...@@ -633,7 +633,7 @@ config SOUND_GUS
depends on SOUND_OSS depends on SOUND_OSS
help help
Say Y here for any type of Gravis Ultrasound card, including the GUS Say Y here for any type of Gravis Ultrasound card, including the GUS
or GUS MAX. See also <file:Documentation/sound/ultrasound> for more or GUS MAX. See also <file:Documentation/sound/oss/ultrasound> for more
information on configuring this card with modules. information on configuring this card with modules.
If you compile the driver into the kernel, you have to add If you compile the driver into the kernel, you have to add
...@@ -706,7 +706,7 @@ config SOUND_MSS ...@@ -706,7 +706,7 @@ config SOUND_MSS
synthesizers (OPL2, OPL3 and OPL4), 6850 UART MIDI Interface. synthesizers (OPL2, OPL3 and OPL4), 6850 UART MIDI Interface.
For cards having native support in VoxWare, consult the card For cards having native support in VoxWare, consult the card
specific instructions in <file:Documentation/sound/README.OSS>. specific instructions in <file:Documentation/sound/oss/README.OSS>.
Some drivers have their own MSS support and saying Y to this option Some drivers have their own MSS support and saying Y to this option
will cause a conflict. will cause a conflict.
...@@ -724,7 +724,7 @@ config SOUND_MPU401 ...@@ -724,7 +724,7 @@ config SOUND_MPU401
will cause a conflict. Also, enabling MPU401 on a system that will cause a conflict. Also, enabling MPU401 on a system that
doesn't really have a MPU401 could cause some trouble. If your card doesn't really have a MPU401 could cause some trouble. If your card
was in the list of supported cards, look at the card specific was in the list of supported cards, look at the card specific
instructions in the <file:Documentation/sound/README.OSS> file. It instructions in the <file:Documentation/sound/oss/README.OSS> file. It
is safe to answer Y if you have a true MPU401 MIDI interface card. is safe to answer Y if you have a true MPU401 MIDI interface card.
If you compile the driver into the kernel, you have to add If you compile the driver into the kernel, you have to add
...@@ -740,7 +740,7 @@ config SOUND_NM256 ...@@ -740,7 +740,7 @@ config SOUND_NM256
laptops. It includes support for an AC97-compatible mixer and an laptops. It includes support for an AC97-compatible mixer and an
apparently proprietary sound engine. apparently proprietary sound engine.
See <file:Documentation/sound/NM256> for further information. See <file:Documentation/sound/oss/NM256> for further information.
config SOUND_MAD16 config SOUND_MAD16
tristate "OPTi MAD16 and/or Mozart based cards" tristate "OPTi MAD16 and/or Mozart based cards"
...@@ -759,8 +759,8 @@ config SOUND_MAD16 ...@@ -759,8 +759,8 @@ config SOUND_MAD16
"mad16=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the "mad16=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the
kernel command line. kernel command line.
See also <file:Documentation/sound/Opti> and See also <file:Documentation/sound/oss/Opti> and
<file:Documentation/sound/MAD16> for more information on setting <file:Documentation/sound/oss/MAD16> for more information on setting
these cards up as modules. these cards up as modules.
config MAD16_OLDCARD config MAD16_OLDCARD
...@@ -778,7 +778,7 @@ config SOUND_PAS ...@@ -778,7 +778,7 @@ config SOUND_PAS
Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio
16 or Logitech SoundMan 16 sound card. Answer N if you have some 16 or Logitech SoundMan 16 sound card. Answer N if you have some
other card made by Media Vision or Logitech since those are not other card made by Media Vision or Logitech since those are not
PAS16 compatible. Please read <file:Documentation/sound/PAS16>. PAS16 compatible. Please read <file:Documentation/sound/oss/PAS16>.
It is not necessary to add Sound Blaster support separately; it It is not necessary to add Sound Blaster support separately; it
is included in PAS support. is included in PAS support.
...@@ -801,7 +801,7 @@ config SOUND_PSS ...@@ -801,7 +801,7 @@ config SOUND_PSS
ADSP-16 or some other card based on the PSS chipset (AD1848 codec + ADSP-16 or some other card based on the PSS chipset (AD1848 codec +
ADSP-2115 DSP chip + Echo ESC614 ASIC CHIP). For more information on ADSP-2115 DSP chip + Echo ESC614 ASIC CHIP). For more information on
how to compile it into the kernel or as a module see the file how to compile it into the kernel or as a module see the file
<file:Documentation/sound/PSS>. <file:Documentation/sound/oss/PSS>.
If you compile the driver into the kernel, you have to add If you compile the driver into the kernel, you have to add
"pss=<io>,<mssio>,<mssirq>,<mssdma>,<mpuio>,<mpuirq>" to the kernel "pss=<io>,<mssio>,<mssirq>,<mssdma>,<mpuio>,<mpuirq>" to the kernel
...@@ -818,7 +818,7 @@ config PSS_MIXER ...@@ -818,7 +818,7 @@ config PSS_MIXER
If you said M to "PSS support" above, you may enable or disable this If you said M to "PSS support" above, you may enable or disable this
PSS mixer with the module parameter pss_mixer. For more information PSS mixer with the module parameter pss_mixer. For more information
see the file <file:Documentation/sound/PSS>. see the file <file:Documentation/sound/oss/PSS>.
config PSS_HAVE_BOOT config PSS_HAVE_BOOT
bool "Have DSPxxx.LD firmware file" bool "Have DSPxxx.LD firmware file"
...@@ -845,16 +845,16 @@ config SOUND_SB ...@@ -845,16 +845,16 @@ config SOUND_SB
SM Games). For an unknown card you may answer Y if the card claims SM Games). For an unknown card you may answer Y if the card claims
to be Sound Blaster-compatible. to be Sound Blaster-compatible.
Please read the file <file:Documentation/sound/Soundblaster>. Please read the file <file:Documentation/sound/oss/Soundblaster>.
You should also say Y here for cards based on the Avance Logic You should also say Y here for cards based on the Avance Logic
ALS-007 and ALS-1X0 chips (read <file:Documentation/sound/ALS>) and ALS-007 and ALS-1X0 chips (read <file:Documentation/sound/oss/ALS>) and
for cards based on ESS chips (read for cards based on ESS chips (read
<file:Documentation/sound/ESS1868> and <file:Documentation/sound/oss/ESS1868> and
<file:Documentation/sound/ESS>). If you have an SB AWE 32 or SB AWE <file:Documentation/sound/oss/ESS>). If you have an SB AWE 32 or SB AWE
64, say Y here and also to "AWE32 synth" below and read 64, say Y here and also to "AWE32 synth" below and read
<file:Documentation/sound/INSTALL.awe>. If you have an IBM Mwave <file:Documentation/sound/oss/INSTALL.awe>. If you have an IBM Mwave
card, say Y here and read <file:Documentation/sound/mwave>. card, say Y here and read <file:Documentation/sound/oss/mwave>.
If you compile the driver into the kernel and don't want to use If you compile the driver into the kernel and don't want to use
isapnp, you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel isapnp, you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel
...@@ -868,8 +868,8 @@ config SOUND_AWE32_SYNTH ...@@ -868,8 +868,8 @@ config SOUND_AWE32_SYNTH
depends on SOUND_OSS depends on SOUND_OSS
help help
Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
similar sound card. See <file:Documentation/sound/README.awe>, similar sound card. See <file:Documentation/sound/oss/README.awe>,
<file:Documentation/sound/AWE32> and the Soundblaster-AWE <file:Documentation/sound/oss/AWE32> and the Soundblaster-AWE
mini-HOWTO, available from <http://www.linuxdoc.org/docs.html#howto> mini-HOWTO, available from <http://www.linuxdoc.org/docs.html#howto>
for more info. for more info.
...@@ -878,8 +878,8 @@ config SOUND_WAVEFRONT ...@@ -878,8 +878,8 @@ config SOUND_WAVEFRONT
depends on SOUND_OSS && m depends on SOUND_OSS && m
help help
Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card
and read the files <file:Documentation/sound/Wavefront> and and read the files <file:Documentation/sound/oss/Wavefront> and
<file:Documentation/sound/Tropez+>. <file:Documentation/sound/oss/Tropez+>.
config SOUND_MAUI config SOUND_MAUI
tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers" tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers"
...@@ -916,7 +916,7 @@ config SOUND_YM3812 ...@@ -916,7 +916,7 @@ config SOUND_YM3812
cards may have software (TSR) FM emulation. Enabling FM support with cards may have software (TSR) FM emulation. Enabling FM support with
these cards may cause trouble (I don't currently know of any such these cards may cause trouble (I don't currently know of any such
cards, however). Please read the file cards, however). Please read the file
<file:Documentation/sound/OPL3> if your card has an OPL3 chip. <file:Documentation/sound/oss/OPL3> if your card has an OPL3 chip.
If you compile the driver into the kernel, you have to add If you compile the driver into the kernel, you have to add
"opl3=<io>" to the kernel command line. "opl3=<io>" to the kernel command line.
...@@ -929,7 +929,7 @@ config SOUND_OPL3SA1 ...@@ -929,7 +929,7 @@ config SOUND_OPL3SA1
help help
Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is
usually built into motherboards. Read usually built into motherboards. Read
<file:Documentation/sound/OPL3-SA> for details. <file:Documentation/sound/oss/OPL3-SA> for details.
If you compile the driver into the kernel, you have to add If you compile the driver into the kernel, you have to add
"opl3sa=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel "opl3sa=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
...@@ -941,7 +941,7 @@ config SOUND_OPL3SA2 ...@@ -941,7 +941,7 @@ config SOUND_OPL3SA2
help help
Say Y or M if you have a card based on one of these Yamaha sound Say Y or M if you have a card based on one of these Yamaha sound
chipsets or the "SAx", which is actually a SA3. Read chipsets or the "SAx", which is actually a SA3. Read
<file:Documentation/sound/OPL3-SA2> for more information on <file:Documentation/sound/oss/OPL3-SA2> for more information on
configuring these cards. configuring these cards.
If you compile the driver into the kernel and do not also If you compile the driver into the kernel and do not also
...@@ -989,9 +989,9 @@ config SOUND_AEDSP16 ...@@ -989,9 +989,9 @@ config SOUND_AEDSP16
accordingly. You should say Y to one and only one of these two accordingly. You should say Y to one and only one of these two
questions. questions.
Read the <file:Documentation/sound/README.OSS> file and the head of Read the <file:Documentation/sound/oss/README.OSS> file and the head of
<file:drivers/sound/aedsp16.c> as well as <file:drivers/sound/aedsp16.c> as well as
<file:Documentation/sound/AudioExcelDSP16> to get more information <file:Documentation/sound/oss/AudioExcelDSP16> to get more information
about this driver and its configuration. about this driver and its configuration.
config SC6600 config SC6600
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment