[ALSA] Sort Kconfig entries

Modules: ISA,PCI drivers

Sort Kconfig entries in alphabetical order.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 5d6c300ac0d5cb0d03d36474e233d5126104d01a..04cafd2d21179420311cd36393296f16c9d900e8 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -41,6 +41,45 @@ config SND_AD1848
          To compile this driver as a module, choose M here: the module
          will be called snd-ad1848.
 
+config SND_ALS100
+       tristate "Avance Logic ALS100/ALS120"
+       depends on SND && PNP && ISA
+       select ISAPNP
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_PCM
+       help
+         Say Y here to include support for soundcards based on Avance
+         Logic ALS100, ALS110, ALS120 and ALS200 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-als100.
+
+config SND_AZT2320
+       tristate "Aztech Systems AZT2320"
+       depends on SND && PNP && ISA
+       select ISAPNP
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_CS4231_LIB
+       help
+         Say Y here to include support for soundcards based on the
+         Aztech Systems AZT2320 chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-azt2320.
+
+config SND_CMI8330
+       tristate "C-Media CMI8330"
+       depends on SND
+       select SND_AD1848_LIB
+       help
+         Say Y here to include support for soundcards based on the
+         C-Media CMI8330 chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-cmi8330.
+
 config SND_CS4231
        tristate "Generic Cirrus Logic CS4231 driver"
        depends on SND
@@ -79,6 +118,20 @@ config SND_CS4236
          To compile this driver as a module, choose M here: the module
          will be called snd-cs4236.
 
+config SND_DT019X
+       tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
+       depends on SND && PNP && ISA
+       select ISAPNP
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_PCM
+       help
+         Say Y here to include support for soundcards based on the
+         Diamond Technologies DT-019X or Avance Logic ALS-007 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-dt019x.
+
 config SND_ES968
        tristate "Generic ESS ES968 driver"
        depends on SND && PNP && ISA
@@ -194,6 +247,19 @@ config SND_INTERWAVE_STB
          To compile this driver as a module, choose M here: the module
          will be called snd-interwave-stb.
 
+config SND_OPL3SA2
+       tristate "Yamaha OPL3-SA2/SA3"
+       depends on SND
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_CS4231_LIB
+       help
+         Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3
+         chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-opl3sa2.
+
 config SND_OPTI92X_AD1848
        tristate "OPTi 82C92x - AD1848"
        depends on SND
@@ -286,85 +352,6 @@ config SND_SB16_CSP
          coprocessor can do variable tasks like various compression and
          decompression algorithms.
 
-config SND_WAVEFRONT
-       tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_CS4231_LIB
-       help
-         Say Y here to include support for Turtle Beach Maui, Tropez
-         and Tropez+ soundcards based on the Wavefront chip.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-wavefront.
-
-config SND_ALS100
-       tristate "Avance Logic ALS100/ALS120"
-       depends on SND && PNP && ISA
-       select ISAPNP
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on Avance
-         Logic ALS100, ALS110, ALS120 and ALS200 chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-als100.
-
-config SND_AZT2320
-       tristate "Aztech Systems AZT2320"
-       depends on SND && PNP && ISA
-       select ISAPNP
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_CS4231_LIB
-       help
-         Say Y here to include support for soundcards based on the
-         Aztech Systems AZT2320 chip.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-azt2320.
-
-config SND_CMI8330
-       tristate "C-Media CMI8330"
-       depends on SND
-       select SND_AD1848_LIB
-       help
-         Say Y here to include support for soundcards based on the
-         C-Media CMI8330 chip.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-cmi8330.
-
-config SND_DT019X
-       tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
-       depends on SND && PNP && ISA
-       select ISAPNP
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on the
-         Diamond Technologies DT-019X or Avance Logic ALS-007 chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-dt019x.
-
-config SND_OPL3SA2
-       tristate "Yamaha OPL3-SA2/SA3"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_CS4231_LIB
-       help
-         Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3
-         chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-opl3sa2.
-
 config SND_SGALAXY
        tristate "Aztech Sound Galaxy"
        depends on SND
@@ -389,4 +376,17 @@ config SND_SSCAPE
          To compile this driver as a module, choose M here: the module
          will be called snd-sscape.
 
+config SND_WAVEFRONT
+       tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
+       depends on SND
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_CS4231_LIB
+       help
+         Say Y here to include support for Turtle Beach Maui, Tropez
+         and Tropez+ soundcards based on the Wavefront chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-wavefront.
+
 endmenu

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 920305c7402ff45046fdf344f1c38e5ecebbddf6..ef7bdc5a96573cd822286dbe07baa71e03ef061d 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -3,6 +3,31 @@
 menu "PCI devices"
        depends on SND!=n && PCI
 
+config SND_AD1889
+       tristate "Analog Devices AD1889"
+       depends on SND
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for the integrated AC97 sound
+         device found in particular on the Hewlett-Packard [BCJ]-xxx0
+         class PA-RISC workstations, using the AD1819 codec.
+
+         To compile this as a module, choose M here: the module
+         will be called snd-ad1889.
+
+config SND_ALS4000
+       tristate "Avance Logic ALS4000"
+       depends on SND && ISA_DMA_API
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_PCM
+       help
+         Say Y here to include support for soundcards based on Avance Logic
+         ALS4000 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-als4000.
+
 config SND_ALI5451
        tristate "ALi M5451 PCI Audio Controller"
        depends on SND
@@ -119,6 +144,44 @@ config SND_BT87X_OVERCLOCK
          Higher sample rates won't hurt your hardware, but audio
          quality may suffer.
 
+config SND_CA0106
+       tristate "SB Audigy LS / Live 24bit"
+       depends on SND
+       select SND_AC97_CODEC
+       select SND_RAWMIDI
+       help
+         Say Y here to include support for the Sound Blaster Audigy LS
+         and Live 24bit.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-ca0106.
+
+config SND_CMIPCI
+       tristate "C-Media 8738, 8338"
+       depends on SND
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_PCM
+       help
+         If you want to use soundcards based on C-Media CMI8338 or CMI8738
+         chips, say Y here and read
+         <file:Documentation/sound/alsa/CMIPCI.txt>.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-cmipci.
+
+config SND_CS4281
+       tristate "Cirrus Logic (Sound Fusion) CS4281"
+       depends on SND
+       select SND_OPL3_LIB
+       select SND_RAWMIDI
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for Cirrus Logic CS4281 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-cs4281.
+
 config SND_CS46XX
        tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
        depends on SND
@@ -139,17 +202,18 @@ config SND_CS46XX_NEW_DSP
 
          This works better than the old code, so say Y.
 
-config SND_CS4281
-       tristate "Cirrus Logic (Sound Fusion) CS4281"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_RAWMIDI
+config SND_CS5535AUDIO
+       tristate "CS5535 Audio"
+       depends on SND && X86 && !X86_64
+       select SND_PCM
        select SND_AC97_CODEC
        help
-         Say Y here to include support for Cirrus Logic CS4281 chips.
+         Say Y here to include support for audio on CS5535 chips. It is
+         referred to as NS CS5535 IO or AMD CS5535 IO companion in
+         various literature.
 
          To compile this driver as a module, choose M here: the module
-         will be called snd-cs4281.
+         will be called snd-cs5535audio.
 
 config SND_EMU10K1
        tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)"
@@ -180,174 +244,6 @@ config SND_EMU10K1X
          To compile this driver as a module, choose M here: the module
          will be called snd-emu10k1x.
 
-config SND_CA0106
-       tristate "SB Audigy LS / Live 24bit"
-       depends on SND
-       select SND_AC97_CODEC
-       select SND_RAWMIDI
-       help
-         Say Y here to include support for the Sound Blaster Audigy LS
-         and Live 24bit.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-ca0106.
-
-config SND_KORG1212
-       tristate "Korg 1212 IO"
-       depends on SND
-       select SND_PCM
-       help
-         Say Y here to include support for Korg 1212IO soundcards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-korg1212.
-
-config SND_MIXART
-       tristate "Digigram miXart"
-       depends on SND
-       select SND_HWDEP
-       select SND_PCM
-       help
-         If you want to use Digigram miXart soundcards, say Y here and
-         read <file:Documentation/sound/alsa/MIXART.txt>.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-mixart.
-
-config SND_NM256
-       tristate "NeoMagic NM256AV/ZX"
-       depends on SND
-       select SND_AC97_CODEC
-       help
-         Say Y here to include support for NeoMagic NM256AV/ZX chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-nm256.
-
-config SND_RME32
-       tristate "RME Digi32, 32/8, 32 PRO"
-       depends on SND
-       select SND_PCM
-       help
-         Say Y to include support for RME Digi32, Digi32 PRO and
-         Digi32/8 (Sek'd Prodif32, Prodif96 and Prodif Gold) audio
-         devices.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-rme32.
-
-config SND_RME96
-       tristate "RME Digi96, 96/8, 96/8 PRO"
-       depends on SND
-       select SND_PCM
-       help
-         Say Y here to include support for RME Digi96, Digi96/8 and
-         Digi96/8 PRO/PAD/PST soundcards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-rme96.
-
-config SND_RME9652
-       tristate "RME Digi9652 (Hammerfall)"
-       depends on SND
-       select SND_PCM
-       help
-         Say Y here to include support for RME Hammerfall (RME
-         Digi9652/Digi9636) soundcards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-rme9652.
-
-config SND_HDSP
-       tristate "RME Hammerfall DSP Audio"
-       depends on SND
-       select SND_HWDEP
-       select SND_RAWMIDI
-       select SND_PCM
-       help
-         Say Y here to include support for RME Hammerfall DSP Audio
-         soundcards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-hdsp.
-
-config SND_HDSPM
-       tristate "RME Hammerfall DSP MADI"
-       depends on SND
-       select SND_HWDEP
-       select SND_RAWMIDI
-       select SND_PCM
-       help
-         Say Y here to include support for RME Hammerfall DSP MADI
-         soundcards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-hdspm.
-
-config SND_TRIDENT
-       tristate "Trident 4D-Wave DX/NX; SiS 7018"
-       depends on SND
-       select SND_MPU401_UART
-       select SND_AC97_CODEC
-       help
-         Say Y here to include support for soundcards based on Trident
-         4D-Wave DX/NX or SiS 7018 chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-trident.
-
-config SND_YMFPCI
-       tristate "Yamaha YMF724/740/744/754"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_AC97_CODEC
-       help
-         Say Y here to include support for Yamaha PCI audio chips -
-         YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-ymfpci.
-
-config SND_AD1889
-       tristate "Analog Devices AD1889"
-       depends on SND
-       select SND_AC97_CODEC
-       help
-         Say Y here to include support for the integrated AC97 sound
-         device found in particular on the Hewlett-Packard [BCJ]-xxx0
-         class PA-RISC workstations, using the AD1819 codec.
-
-         To compile this as a module, choose M here: the module
-         will be called snd-ad1889.
-
-config SND_ALS4000
-       tristate "Avance Logic ALS4000"
-       depends on SND && ISA_DMA_API
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say Y here to include support for soundcards based on Avance Logic
-         ALS4000 chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-als4000.
-
-config SND_CMIPCI
-       tristate "C-Media 8738, 8338"
-       depends on SND
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         If you want to use soundcards based on C-Media CMI8338 or CMI8738
-         chips, say Y here and read
-         <file:Documentation/sound/alsa/CMIPCI.txt>.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-cmipci.
-
 config SND_ENS1370
        tristate "(Creative) Ensoniq AudioPCI 1370"
        depends on SND
@@ -359,19 +255,6 @@ config SND_ENS1370
          To compile this driver as a module, choose M here: the module
          will be called snd-ens1370.
 
-config SND_CS5535AUDIO
-       tristate "CS5535 Audio"
-       depends on SND && X86 && !X86_64
-       select SND_PCM
-       select SND_AC97_CODEC
-       help
-         Say Y here to include support for audio on CS5535 chips. It is
-         referred to as NS CS5535 IO or AMD CS5535 IO companion in
-         various literature.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-cs5535audio.
-
 config SND_ENS1371
        tristate "(Creative) Ensoniq AudioPCI 1371/1373"
        depends on SND
@@ -409,17 +292,6 @@ config SND_ES1968
          To compile this driver as a module, choose M here: the module
          will be called snd-es1968.
 
-config SND_MAESTRO3
-       tristate "ESS Allegro/Maestro3"
-       depends on SND
-       select SND_AC97_CODEC
-       help
-         Say Y here to include support for soundcards based on ESS Maestro 3
-         (Allegro) chips.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-maestro3.
-
 config SND_FM801
        tristate "ForteMedia FM801"
        depends on SND
@@ -445,6 +317,43 @@ config SND_FM801_TEA575X
          To compile this driver as a module, choose M here: the module
          will be called snd-fm801-tea575x.
 
+config SND_HDA_INTEL
+       tristate "Intel HD Audio"
+       depends on SND
+       select SND_PCM
+       help
+         Say Y here to include support for Intel "High Definition
+         Audio" (Azalia) motherboard devices.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-hda-intel.
+
+config SND_HDSP
+       tristate "RME Hammerfall DSP Audio"
+       depends on SND
+       select SND_HWDEP
+       select SND_RAWMIDI
+       select SND_PCM
+       help
+         Say Y here to include support for RME Hammerfall DSP Audio
+         soundcards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-hdsp.
+
+config SND_HDSPM
+       tristate "RME Hammerfall DSP MADI"
+       depends on SND
+       select SND_HWDEP
+       select SND_RAWMIDI
+       select SND_PCM
+       help
+         Say Y here to include support for RME Hammerfall DSP MADI
+         soundcards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-hdspm.
+
 config SND_ICE1712
        tristate "ICEnsemble ICE1712 (Envy24)"
        depends on SND
@@ -503,6 +412,83 @@ config SND_INTEL8X0M
          To compile this driver as a module, choose M here: the module
          will be called snd-intel8x0m.
 
+config SND_KORG1212
+       tristate "Korg 1212 IO"
+       depends on SND
+       select SND_PCM
+       help
+         Say Y here to include support for Korg 1212IO soundcards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-korg1212.
+
+config SND_MAESTRO3
+       tristate "ESS Allegro/Maestro3"
+       depends on SND
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for soundcards based on ESS Maestro 3
+         (Allegro) chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-maestro3.
+
+config SND_MIXART
+       tristate "Digigram miXart"
+       depends on SND
+       select SND_HWDEP
+       select SND_PCM
+       help
+         If you want to use Digigram miXart soundcards, say Y here and
+         read <file:Documentation/sound/alsa/MIXART.txt>.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-mixart.
+
+config SND_NM256
+       tristate "NeoMagic NM256AV/ZX"
+       depends on SND
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for NeoMagic NM256AV/ZX chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-nm256.
+
+config SND_RME32
+       tristate "RME Digi32, 32/8, 32 PRO"
+       depends on SND
+       select SND_PCM
+       help
+         Say Y to include support for RME Digi32, Digi32 PRO and
+         Digi32/8 (Sek'd Prodif32, Prodif96 and Prodif Gold) audio
+         devices.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-rme32.
+
+config SND_RME96
+       tristate "RME Digi96, 96/8, 96/8 PRO"
+       depends on SND
+       select SND_PCM
+       help
+         Say Y here to include support for RME Digi96, Digi96/8 and
+         Digi96/8 PRO/PAD/PST soundcards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-rme96.
+
+config SND_RME9652
+       tristate "RME Digi9652 (Hammerfall)"
+       depends on SND
+       select SND_PCM
+       help
+         Say Y here to include support for RME Hammerfall (RME
+         Digi9652/Digi9636) soundcards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-rme9652.
+
 config SND_SONICVIBES
        tristate "S3 SonicVibes"
        depends on SND
@@ -516,6 +502,18 @@ config SND_SONICVIBES
          To compile this driver as a module, choose M here: the module
          will be called snd-sonicvibes.
 
+config SND_TRIDENT
+       tristate "Trident 4D-Wave DX/NX; SiS 7018"
+       depends on SND
+       select SND_MPU401_UART
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for soundcards based on Trident
+         4D-Wave DX/NX or SiS 7018 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-trident.
+
 config SND_VIA82XX
        tristate "VIA 82C686A/B, 8233/8235 AC97 Controller"
        depends on SND
@@ -549,15 +547,17 @@ config SND_VX222
          To compile this driver as a module, choose M here: the module
          will be called snd-vx222.
 
-config SND_HDA_INTEL
-       tristate "Intel HD Audio"
+config SND_YMFPCI
+       tristate "Yamaha YMF724/740/744/754"
        depends on SND
-       select SND_PCM
+       select SND_OPL3_LIB
+       select SND_MPU401_UART
+       select SND_AC97_CODEC
        help
-         Say Y here to include support for Intel "High Definition
-         Audio" (Azalia) motherboard devices.
+         Say Y here to include support for Yamaha PCI audio chips -
+         YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.
 
          To compile this driver as a module, choose M here: the module
-         will be called snd-hda-intel.
+         will be called snd-ymfpci.
 
 endmenu