Commit 89fe5117 authored by Takashi Iwai's avatar Takashi Iwai

sound: Convert to menuconfig

Convert menu in sound Kconfig files to menuconfig and if.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 06b5fb97
# sound/Config.in # sound/Config.in
# #
menu "Sound" menuconfig SOUND
depends on HAS_IOMEM
config SOUND
tristate "Sound card support" tristate "Sound card support"
depends on HAS_IOMEM
help help
If you have a sound card in your computer, i.e. if it can say more If you have a sound card in your computer, i.e. if it can say more
than an occasional beep, say Y. Be sure to have all the information than an occasional beep, say Y. Be sure to have all the information
...@@ -28,22 +26,22 @@ config SOUND ...@@ -28,22 +26,22 @@ config SOUND
and read <file:Documentation/sound/oss/README.modules>; the module and read <file:Documentation/sound/oss/README.modules>; the module
will be called soundcore. will be called soundcore.
if SOUND
source "sound/oss/dmasound/Kconfig" source "sound/oss/dmasound/Kconfig"
if !M68K if !M68K
menu "Advanced Linux Sound Architecture" menuconfig SND
depends on SOUND!=n
config SND
tristate "Advanced Linux Sound Architecture" tristate "Advanced Linux Sound Architecture"
depends on SOUND
help help
Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture), Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture),
the new base sound system. the new base sound system.
For more information, see <http://www.alsa-project.org/> For more information, see <http://www.alsa-project.org/>
if SND
source "sound/core/Kconfig" source "sound/core/Kconfig"
source "sound/drivers/Kconfig" source "sound/drivers/Kconfig"
...@@ -58,9 +56,7 @@ source "sound/aoa/Kconfig" ...@@ -58,9 +56,7 @@ source "sound/aoa/Kconfig"
source "sound/arm/Kconfig" source "sound/arm/Kconfig"
if SPI
source "sound/spi/Kconfig" source "sound/spi/Kconfig"
endif
source "sound/mips/Kconfig" source "sound/mips/Kconfig"
...@@ -80,22 +76,20 @@ source "sound/parisc/Kconfig" ...@@ -80,22 +76,20 @@ source "sound/parisc/Kconfig"
source "sound/soc/Kconfig" source "sound/soc/Kconfig"
endmenu endif # SND
menu "Open Sound System" menuconfig SOUND_PRIME
depends on SOUND!=n
config SOUND_PRIME
tristate "Open Sound System (DEPRECATED)" tristate "Open Sound System (DEPRECATED)"
depends on SOUND
help help
Say 'Y' or 'M' to enable Open Sound System drivers. Say 'Y' or 'M' to enable Open Sound System drivers.
if SOUND_PRIME
source "sound/oss/Kconfig" source "sound/oss/Kconfig"
endmenu endif # SOUND_PRIME
endif endif # !M68K
config AC97_BUS config AC97_BUS
tristate tristate
...@@ -105,4 +99,4 @@ config AC97_BUS ...@@ -105,4 +99,4 @@ config AC97_BUS
sound although they're sharing the AC97 bus. Concerned drivers sound although they're sharing the AC97 bus. Concerned drivers
should "select" this. should "select" this.
endmenu endif # SOUND
menu "Apple Onboard Audio driver" menuconfig SND_AOA
depends on SND!=n && PPC_PMAC
config SND_AOA
tristate "Apple Onboard Audio driver" tristate "Apple Onboard Audio driver"
depends on SND depends on PPC_PMAC
select SND_PCM select SND_PCM
---help--- ---help---
This option enables the new driver for the various This option enables the new driver for the various
Apple Onboard Audio components. Apple Onboard Audio components.
if SND_AOA
source "sound/aoa/fabrics/Kconfig" source "sound/aoa/fabrics/Kconfig"
source "sound/aoa/codecs/Kconfig" source "sound/aoa/codecs/Kconfig"
source "sound/aoa/soundbus/Kconfig" source "sound/aoa/soundbus/Kconfig"
endmenu endif # SND_AOA
config SND_AOA_ONYX config SND_AOA_ONYX
tristate "support Onyx chip" tristate "support Onyx chip"
depends on SND_AOA
select I2C select I2C
select I2C_POWERMAC select I2C_POWERMAC
---help--- ---help---
...@@ -10,7 +9,6 @@ config SND_AOA_ONYX ...@@ -10,7 +9,6 @@ config SND_AOA_ONYX
#config SND_AOA_TOPAZ #config SND_AOA_TOPAZ
# tristate "support Topaz chips" # tristate "support Topaz chips"
# depends on SND_AOA
# ---help--- # ---help---
# This option enables support for the Topaz (CS84xx) # This option enables support for the Topaz (CS84xx)
# codec chips found in the latest Apple machines, # codec chips found in the latest Apple machines,
...@@ -19,7 +17,6 @@ config SND_AOA_ONYX ...@@ -19,7 +17,6 @@ config SND_AOA_ONYX
config SND_AOA_TAS config SND_AOA_TAS
tristate "support TAS chips" tristate "support TAS chips"
depends on SND_AOA
select I2C select I2C
select I2C_POWERMAC select I2C_POWERMAC
---help--- ---help---
...@@ -29,7 +26,6 @@ config SND_AOA_TAS ...@@ -29,7 +26,6 @@ config SND_AOA_TAS
config SND_AOA_TOONIE config SND_AOA_TOONIE
tristate "support Toonie chip" tristate "support Toonie chip"
depends on SND_AOA
---help--- ---help---
This option enables support for the toonie codec This option enables support for the toonie codec
found in the Mac Mini. If you have a Mac Mini and found in the Mac Mini. If you have a Mac Mini and
......
config SND_AOA_FABRIC_LAYOUT config SND_AOA_FABRIC_LAYOUT
tristate "layout-id fabric" tristate "layout-id fabric"
depends on SND_AOA
select SND_AOA_SOUNDBUS select SND_AOA_SOUNDBUS
select SND_AOA_SOUNDBUS_I2S select SND_AOA_SOUNDBUS_I2S
---help--- ---help---
......
config SND_AOA_SOUNDBUS config SND_AOA_SOUNDBUS
tristate "Apple Soundbus support" tristate "Apple Soundbus support"
depends on SOUND
select SND_PCM select SND_PCM
---help--- ---help---
This option enables the generic driver for the soundbus This option enables the generic driver for the soundbus
......
# ALSA ARM drivers # ALSA ARM drivers
menu "ALSA ARM devices" menuconfig SND_ARM
depends on SND!=n && ARM bool "ARM sound devices"
depends on ARM
default y
help
Support for sound devices specific to ARM architectures.
Drivers that are implemented on ASoC can be found in
"ALSA for SoC audio support" section.
if SND_ARM
config SND_SA11XX_UDA1341 config SND_SA11XX_UDA1341
tristate "SA11xx UDA1341TS driver (iPaq H3600)" tristate "SA11xx UDA1341TS driver (iPaq H3600)"
depends on ARCH_SA1100 && SND && L3 depends on ARCH_SA1100 && L3
select SND_PCM select SND_PCM
help help
Say Y here if you have a Compaq iPaq H3x00 handheld computer Say Y here if you have a Compaq iPaq H3x00 handheld computer
...@@ -16,7 +24,7 @@ config SND_SA11XX_UDA1341 ...@@ -16,7 +24,7 @@ config SND_SA11XX_UDA1341
config SND_ARMAACI config SND_ARMAACI
tristate "ARM PrimeCell PL041 AC Link support" tristate "ARM PrimeCell PL041 AC Link support"
depends on SND && ARM_AMBA depends on ARM_AMBA
select SND_PCM select SND_PCM
select SND_AC97_CODEC select SND_AC97_CODEC
...@@ -26,11 +34,12 @@ config SND_PXA2XX_PCM ...@@ -26,11 +34,12 @@ config SND_PXA2XX_PCM
config SND_PXA2XX_AC97 config SND_PXA2XX_AC97
tristate "AC97 driver for the Intel PXA2xx chip" tristate "AC97 driver for the Intel PXA2xx chip"
depends on ARCH_PXA && SND depends on ARCH_PXA
select SND_PXA2XX_PCM select SND_PXA2XX_PCM
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y or M if you want to support any AC97 codec attached to Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface. the PXA2xx AC97 interface.
endmenu endif # SND_ARM
# ALSA soundcard-configuration # ALSA soundcard-configuration
config SND_TIMER config SND_TIMER
tristate tristate
depends on SND
config SND_PCM config SND_PCM
tristate tristate
select SND_TIMER select SND_TIMER
depends on SND
config SND_HWDEP config SND_HWDEP
tristate tristate
depends on SND
config SND_RAWMIDI config SND_RAWMIDI
tristate tristate
depends on SND
config SND_SEQUENCER config SND_SEQUENCER
tristate "Sequencer support" tristate "Sequencer support"
depends on SND
select SND_TIMER select SND_TIMER
help help
Say Y or M to enable MIDI sequencer and router support. This Say Y or M to enable MIDI sequencer and router support. This
...@@ -44,11 +39,9 @@ config SND_SEQ_DUMMY ...@@ -44,11 +39,9 @@ config SND_SEQ_DUMMY
config SND_OSSEMUL config SND_OSSEMUL
bool bool
depends on SND
config SND_MIXER_OSS config SND_MIXER_OSS
tristate "OSS Mixer API" tristate "OSS Mixer API"
depends on SND
select SND_OSSEMUL select SND_OSSEMUL
help help
To enable OSS mixer API emulation (/dev/mixer*), say Y here To enable OSS mixer API emulation (/dev/mixer*), say Y here
...@@ -61,7 +54,6 @@ config SND_MIXER_OSS ...@@ -61,7 +54,6 @@ config SND_MIXER_OSS
config SND_PCM_OSS config SND_PCM_OSS
tristate "OSS PCM (digital audio) API" tristate "OSS PCM (digital audio) API"
depends on SND
select SND_OSSEMUL select SND_OSSEMUL
select SND_PCM select SND_PCM
help help
...@@ -84,7 +76,7 @@ config SND_PCM_OSS_PLUGINS ...@@ -84,7 +76,7 @@ config SND_PCM_OSS_PLUGINS
config SND_SEQUENCER_OSS config SND_SEQUENCER_OSS
bool "OSS Sequencer API" bool "OSS Sequencer API"
depends on SND && SND_SEQUENCER depends on SND_SEQUENCER
select SND_OSSEMUL select SND_OSSEMUL
help help
Say Y here to enable OSS sequencer emulation (both Say Y here to enable OSS sequencer emulation (both
...@@ -98,7 +90,7 @@ config SND_SEQUENCER_OSS ...@@ -98,7 +90,7 @@ config SND_SEQUENCER_OSS
config SND_RTCTIMER config SND_RTCTIMER
tristate "RTC Timer support" tristate "RTC Timer support"
depends on SND && RTC depends on RTC
select SND_TIMER select SND_TIMER
help help
Say Y here to enable RTC timer support for ALSA. ALSA uses Say Y here to enable RTC timer support for ALSA. ALSA uses
...@@ -123,7 +115,6 @@ config SND_SEQ_RTCTIMER_DEFAULT ...@@ -123,7 +115,6 @@ config SND_SEQ_RTCTIMER_DEFAULT
config SND_DYNAMIC_MINORS config SND_DYNAMIC_MINORS
bool "Dynamic device file minor numbers" bool "Dynamic device file minor numbers"
depends on SND
help help
If you say Y here, the minor numbers of ALSA device files in If you say Y here, the minor numbers of ALSA device files in
/dev/snd/ are allocated dynamically. This allows you to have /dev/snd/ are allocated dynamically. This allows you to have
...@@ -134,7 +125,6 @@ config SND_DYNAMIC_MINORS ...@@ -134,7 +125,6 @@ config SND_DYNAMIC_MINORS
config SND_SUPPORT_OLD_API config SND_SUPPORT_OLD_API
bool "Support old ALSA API" bool "Support old ALSA API"
depends on SND
default y default y
help help
Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3 Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3
...@@ -142,7 +132,7 @@ config SND_SUPPORT_OLD_API ...@@ -142,7 +132,7 @@ config SND_SUPPORT_OLD_API
config SND_VERBOSE_PROCFS config SND_VERBOSE_PROCFS
bool "Verbose procfs contents" bool "Verbose procfs contents"
depends on SND && PROC_FS depends on PROC_FS
default y default y
help help
Say Y here to include code for verbose procfs contents (provides Say Y here to include code for verbose procfs contents (provides
...@@ -151,7 +141,6 @@ config SND_VERBOSE_PROCFS ...@@ -151,7 +141,6 @@ config SND_VERBOSE_PROCFS
config SND_VERBOSE_PRINTK config SND_VERBOSE_PRINTK
bool "Verbose printk" bool "Verbose printk"
depends on SND
help help
Say Y here to enable verbose log messages. These messages Say Y here to enable verbose log messages. These messages
will help to identify source file and position containing will help to identify source file and position containing
...@@ -161,7 +150,6 @@ config SND_VERBOSE_PRINTK ...@@ -161,7 +150,6 @@ config SND_VERBOSE_PRINTK
config SND_DEBUG config SND_DEBUG
bool "Debug" bool "Debug"
depends on SND
help help
Say Y here to enable ALSA debug code. Say Y here to enable ALSA debug code.
...@@ -184,4 +172,3 @@ config SND_PCM_XRUN_DEBUG ...@@ -184,4 +172,3 @@ config SND_PCM_XRUN_DEBUG
config SND_VMASTER config SND_VMASTER
bool bool
depends on SND
# ALSA generic drivers config SND_MPU401_UART
tristate
select SND_RAWMIDI
menu "Generic devices" config SND_OPL3_LIB
depends on SND!=n tristate
select SND_TIMER
select SND_HWDEP
config SND_OPL4_LIB
tristate
select SND_TIMER
select SND_HWDEP
config SND_VX_LIB
tristate
select SND_HWDEP
select SND_PCM
config SND_AC97_CODEC
tristate
select SND_PCM
select AC97_BUS
select SND_VMASTER
menuconfig SND_DRIVERS
bool "Generic sound devices"
default y
help
Support for generic sound devices.
if SND_DRIVERS
config SND_PCSP config SND_PCSP
tristate "PC-Speaker support (READ HELP!)" tristate "PC-Speaker support (READ HELP!)"
depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
depends on INPUT depends on INPUT
depends on EXPERIMENTAL depends on EXPERIMENTAL
depends on SND
select SND_PCM select SND_PCM
help help
If you don't have a sound card in your computer, you can include a If you don't have a sound card in your computer, you can include a
...@@ -35,34 +61,8 @@ config SND_PCSP ...@@ -35,34 +61,8 @@ config SND_PCSP
Say M if you don't. Say M if you don't.
Say Y only if you really know what you do. Say Y only if you really know what you do.
config SND_MPU401_UART
tristate
select SND_RAWMIDI
config SND_OPL3_LIB
tristate
select SND_TIMER
select SND_HWDEP
config SND_OPL4_LIB
tristate
select SND_TIMER
select SND_HWDEP
config SND_VX_LIB
tristate
select SND_HWDEP
select SND_PCM
config SND_AC97_CODEC
tristate
select SND_PCM
select AC97_BUS
select SND_VMASTER
config SND_DUMMY config SND_DUMMY
tristate "Dummy (/dev/null) soundcard" tristate "Dummy (/dev/null) soundcard"
depends on SND
select SND_PCM select SND_PCM
help help
Say Y here to include the dummy driver. This driver does Say Y here to include the dummy driver. This driver does
...@@ -91,7 +91,6 @@ config SND_VIRMIDI ...@@ -91,7 +91,6 @@ config SND_VIRMIDI
config SND_MTPAV config SND_MTPAV
tristate "MOTU MidiTimePiece AV multiport MIDI" tristate "MOTU MidiTimePiece AV multiport MIDI"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
help help
To use a MOTU MidiTimePiece AV multiport MIDI adapter To use a MOTU MidiTimePiece AV multiport MIDI adapter
...@@ -103,7 +102,7 @@ config SND_MTPAV ...@@ -103,7 +102,7 @@ config SND_MTPAV
config SND_MTS64 config SND_MTS64
tristate "ESI Miditerminal 4140 driver" tristate "ESI Miditerminal 4140 driver"
depends on SND && PARPORT depends on PARPORT
select SND_RAWMIDI select SND_RAWMIDI
help help
The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with
...@@ -116,7 +115,6 @@ config SND_MTS64 ...@@ -116,7 +115,6 @@ config SND_MTS64
config SND_SERIAL_U16550 config SND_SERIAL_U16550
tristate "UART16550 serial MIDI driver" tristate "UART16550 serial MIDI driver"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
help help
To include support for MIDI serial port interfaces, say Y here To include support for MIDI serial port interfaces, say Y here
...@@ -132,7 +130,6 @@ config SND_SERIAL_U16550 ...@@ -132,7 +130,6 @@ config SND_SERIAL_U16550
config SND_MPU401 config SND_MPU401
tristate "Generic MPU-401 UART driver" tristate "Generic MPU-401 UART driver"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
help help
Say Y here to include support for MIDI ports compatible with Say Y here to include support for MIDI ports compatible with
...@@ -143,7 +140,7 @@ config SND_MPU401 ...@@ -143,7 +140,7 @@ config SND_MPU401
config SND_PORTMAN2X4 config SND_PORTMAN2X4
tristate "Portman 2x4 driver" tristate "Portman 2x4 driver"
depends on SND && PARPORT depends on PARPORT
select SND_RAWMIDI select SND_RAWMIDI
help help
Say Y here to include support for Midiman Portman 2x4 parallel Say Y here to include support for Midiman Portman 2x4 parallel
...@@ -154,7 +151,7 @@ config SND_PORTMAN2X4 ...@@ -154,7 +151,7 @@ config SND_PORTMAN2X4
config SND_ML403_AC97CR config SND_ML403_AC97CR
tristate "Xilinx ML403 AC97 Controller Reference" tristate "Xilinx ML403 AC97 Controller Reference"
depends on SND && XILINX_VIRTEX depends on XILINX_VIRTEX
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the Say Y here to include support for the
...@@ -164,4 +161,4 @@ config SND_ML403_AC97CR ...@@ -164,4 +161,4 @@ config SND_ML403_AC97CR
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-ml403_ac97cr. will be called snd-ml403_ac97cr.
endmenu endif # SND_DRIVERS
...@@ -21,12 +21,17 @@ config SND_SB16_DSP ...@@ -21,12 +21,17 @@ config SND_SB16_DSP
select SND_PCM select SND_PCM
select SND_SB_COMMON select SND_SB_COMMON
menu "ISA devices" menuconfig SND_ISA
depends on SND!=n && ISA && ISA_DMA_API bool "ISA sound devices"
depends on ISA && ISA_DMA_API
default y
help
Support for sound devices connected via the ISA bus.
if SND_ISA
config SND_ADLIB config SND_ADLIB
tristate "AdLib FM card" tristate "AdLib FM card"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
help help
Say Y here to include support for AdLib FM cards. Say Y here to include support for AdLib FM cards.
...@@ -36,7 +41,7 @@ config SND_ADLIB ...@@ -36,7 +41,7 @@ config SND_ADLIB
config SND_AD1816A config SND_AD1816A
tristate "Analog Devices SoundPort AD1816A" tristate "Analog Devices SoundPort AD1816A"
depends on SND && PNP && ISA depends on PNP
select ISAPNP select ISAPNP
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -50,7 +55,6 @@ config SND_AD1816A ...@@ -50,7 +55,6 @@ config SND_AD1816A
config SND_AD1848 config SND_AD1848
tristate "Generic AD1848/CS4248 driver" tristate "Generic AD1848/CS4248 driver"
depends on SND
select SND_AD1848_LIB select SND_AD1848_LIB
help help
Say Y here to include support for AD1848 (Analog Devices) or Say Y here to include support for AD1848 (Analog Devices) or
...@@ -64,7 +68,7 @@ config SND_AD1848 ...@@ -64,7 +68,7 @@ config SND_AD1848
config SND_ALS100 config SND_ALS100
tristate "Avance Logic ALS100/ALS120" tristate "Avance Logic ALS100/ALS120"
depends on SND && PNP && ISA depends on PNP
select ISAPNP select ISAPNP
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -78,7 +82,7 @@ config SND_ALS100 ...@@ -78,7 +82,7 @@ config SND_ALS100
config SND_AZT2320 config SND_AZT2320
tristate "Aztech Systems AZT2320" tristate "Aztech Systems AZT2320"
depends on SND && PNP && ISA depends on PNP
select ISAPNP select ISAPNP
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -92,7 +96,6 @@ config SND_AZT2320 ...@@ -92,7 +96,6 @@ config SND_AZT2320
config SND_CMI8330 config SND_CMI8330
tristate "C-Media CMI8330" tristate "C-Media CMI8330"
depends on SND
select SND_AD1848_LIB select SND_AD1848_LIB
select SND_SB16_DSP select SND_SB16_DSP
help help
...@@ -104,7 +107,6 @@ config SND_CMI8330 ...@@ -104,7 +107,6 @@ config SND_CMI8330
config SND_CS4231 config SND_CS4231
tristate "Generic Cirrus Logic CS4231 driver" tristate "Generic Cirrus Logic CS4231 driver"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_CS4231_LIB
help help
...@@ -116,7 +118,6 @@ config SND_CS4231 ...@@ -116,7 +118,6 @@ config SND_CS4231
config SND_CS4232 config SND_CS4232
tristate "Generic Cirrus Logic CS4232 driver" tristate "Generic Cirrus Logic CS4232 driver"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_CS4231_LIB
...@@ -129,7 +130,6 @@ config SND_CS4232 ...@@ -129,7 +130,6 @@ config SND_CS4232
config SND_CS4236 config SND_CS4236
tristate "Generic Cirrus Logic CS4236+ driver" tristate "Generic Cirrus Logic CS4236+ driver"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_CS4231_LIB
...@@ -142,7 +142,7 @@ config SND_CS4236 ...@@ -142,7 +142,7 @@ config SND_CS4236
config SND_DT019X config SND_DT019X
tristate "Diamond Technologies DT-019X, Avance Logic ALS-007" tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
depends on SND && PNP && ISA depends on PNP
select ISAPNP select ISAPNP
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -156,7 +156,7 @@ config SND_DT019X ...@@ -156,7 +156,7 @@ config SND_DT019X
config SND_ES968 config SND_ES968
tristate "Generic ESS ES968 driver" tristate "Generic ESS ES968 driver"
depends on SND && PNP && ISA depends on PNP
select ISAPNP select ISAPNP
select SND_MPU401_UART select SND_MPU401_UART
select SND_SB8_DSP select SND_SB8_DSP
...@@ -168,7 +168,6 @@ config SND_ES968 ...@@ -168,7 +168,6 @@ config SND_ES968
config SND_ES1688 config SND_ES1688
tristate "Generic ESS ES688/ES1688 driver" tristate "Generic ESS ES688/ES1688 driver"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -181,7 +180,6 @@ config SND_ES1688 ...@@ -181,7 +180,6 @@ config SND_ES1688
config SND_ES18XX config SND_ES18XX
tristate "Generic ESS ES18xx driver" tristate "Generic ESS ES18xx driver"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -193,7 +191,7 @@ config SND_ES18XX ...@@ -193,7 +191,7 @@ config SND_ES18XX
config SND_SC6000 config SND_SC6000
tristate "Gallant SC-6000, Audio Excel DSP 16" tristate "Gallant SC-6000, Audio Excel DSP 16"
depends on SND && HAS_IOPORT depends on HAS_IOPORT
select SND_AD1848_LIB select SND_AD1848_LIB
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -209,7 +207,6 @@ config SND_GUS_SYNTH ...@@ -209,7 +207,6 @@ config SND_GUS_SYNTH
config SND_GUSCLASSIC config SND_GUSCLASSIC
tristate "Gravis UltraSound Classic" tristate "Gravis UltraSound Classic"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
select SND_GUS_SYNTH select SND_GUS_SYNTH
...@@ -222,7 +219,6 @@ config SND_GUSCLASSIC ...@@ -222,7 +219,6 @@ config SND_GUSCLASSIC
config SND_GUSEXTREME config SND_GUSEXTREME
tristate "Gravis UltraSound Extreme" tristate "Gravis UltraSound Extreme"
depends on SND
select SND_HWDEP select SND_HWDEP
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -236,7 +232,6 @@ config SND_GUSEXTREME ...@@ -236,7 +232,6 @@ config SND_GUSEXTREME
config SND_GUSMAX config SND_GUSMAX
tristate "Gravis UltraSound MAX" tristate "Gravis UltraSound MAX"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
select SND_CS4231_LIB select SND_CS4231_LIB
select SND_GUS_SYNTH select SND_GUS_SYNTH
...@@ -249,7 +244,7 @@ config SND_GUSMAX ...@@ -249,7 +244,7 @@ config SND_GUSMAX
config SND_INTERWAVE config SND_INTERWAVE
tristate "AMD InterWave, Gravis UltraSound PnP" tristate "AMD InterWave, Gravis UltraSound PnP"
depends on SND && PNP && ISA depends on PNP
select SND_RAWMIDI select SND_RAWMIDI
select SND_CS4231_LIB select SND_CS4231_LIB
select SND_GUS_SYNTH select SND_GUS_SYNTH
...@@ -263,7 +258,7 @@ config SND_INTERWAVE ...@@ -263,7 +258,7 @@ config SND_INTERWAVE
config SND_INTERWAVE_STB config SND_INTERWAVE_STB
tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)" tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
depends on SND && PNP && ISA depends on PNP
select SND_RAWMIDI select SND_RAWMIDI
select SND_CS4231_LIB select SND_CS4231_LIB
select SND_GUS_SYNTH select SND_GUS_SYNTH
...@@ -277,7 +272,6 @@ config SND_INTERWAVE_STB ...@@ -277,7 +272,6 @@ config SND_INTERWAVE_STB
config SND_OPL3SA2 config SND_OPL3SA2
tristate "Yamaha OPL3-SA2/SA3" tristate "Yamaha OPL3-SA2/SA3"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_CS4231_LIB
...@@ -290,7 +284,6 @@ config SND_OPL3SA2 ...@@ -290,7 +284,6 @@ config SND_OPL3SA2
config SND_OPTI92X_AD1848 config SND_OPTI92X_AD1848
tristate "OPTi 82C92x - AD1848" tristate "OPTi 82C92x - AD1848"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_OPL4_LIB select SND_OPL4_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -304,7 +297,6 @@ config SND_OPTI92X_AD1848 ...@@ -304,7 +297,6 @@ config SND_OPTI92X_AD1848
config SND_OPTI92X_CS4231 config SND_OPTI92X_CS4231
tristate "OPTi 82C92x - CS4231" tristate "OPTi 82C92x - CS4231"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_OPL4_LIB select SND_OPL4_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -318,7 +310,6 @@ config SND_OPTI92X_CS4231 ...@@ -318,7 +310,6 @@ config SND_OPTI92X_CS4231
config SND_OPTI93X config SND_OPTI93X
tristate "OPTi 82C93x" tristate "OPTi 82C93x"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -331,7 +322,6 @@ config SND_OPTI93X ...@@ -331,7 +322,6 @@ config SND_OPTI93X
config SND_MIRO config SND_MIRO
tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver" tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"
depends on SND
select SND_OPL4_LIB select SND_OPL4_LIB
select SND_CS4231_LIB select SND_CS4231_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -345,7 +335,6 @@ config SND_MIRO ...@@ -345,7 +335,6 @@ config SND_MIRO
config SND_SB8 config SND_SB8
tristate "Sound Blaster 1.0/2.0/Pro (8-bit)" tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_RAWMIDI select SND_RAWMIDI
select SND_SB8_DSP select SND_SB8_DSP
...@@ -358,7 +347,6 @@ config SND_SB8 ...@@ -358,7 +347,6 @@ config SND_SB8
config SND_SB16 config SND_SB16
tristate "Sound Blaster 16 (PnP)" tristate "Sound Blaster 16 (PnP)"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_SB16_DSP select SND_SB16_DSP
...@@ -371,7 +359,6 @@ config SND_SB16 ...@@ -371,7 +359,6 @@ config SND_SB16
config SND_SBAWE config SND_SBAWE
tristate "Sound Blaster AWE (32,64) (PnP)" tristate "Sound Blaster AWE (32,64) (PnP)"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_SB16_DSP select SND_SB16_DSP
...@@ -402,7 +389,6 @@ config SND_SB16_CSP_FIRMWARE_IN_KERNEL ...@@ -402,7 +389,6 @@ config SND_SB16_CSP_FIRMWARE_IN_KERNEL
config SND_SGALAXY config SND_SGALAXY
tristate "Aztech Sound Galaxy" tristate "Aztech Sound Galaxy"
depends on SND
select SND_AD1848_LIB select SND_AD1848_LIB
help help
Say Y here to include support for Aztech Sound Galaxy Say Y here to include support for Aztech Sound Galaxy
...@@ -413,7 +399,6 @@ config SND_SGALAXY ...@@ -413,7 +399,6 @@ config SND_SGALAXY
config SND_SSCAPE config SND_SSCAPE
tristate "Ensoniq SoundScape PnP driver" tristate "Ensoniq SoundScape PnP driver"
depends on SND
select SND_HWDEP select SND_HWDEP
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_CS4231_LIB
...@@ -426,7 +411,6 @@ config SND_SSCAPE ...@@ -426,7 +411,6 @@ config SND_SSCAPE
config SND_WAVEFRONT config SND_WAVEFRONT
tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
depends on SND
select FW_LOADER select FW_LOADER
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -448,4 +432,5 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL ...@@ -448,4 +432,5 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
you need to install the firmware files from the you need to install the firmware files from the
alsa-firmware package. alsa-firmware package.
endmenu endif # SND_ISA
# ALSA MIPS drivers # ALSA MIPS drivers
menu "ALSA MIPS devices" menuconfig SND_MIPS
depends on SND!=n && MIPS bool "MIPS sound devices"
depends on MIPS
default y
help
Support for sound devices of MIPS architectures.
if SND_MIPS
config SND_AU1X00 config SND_AU1X00
tristate "Au1x00 AC97 Port Driver" tristate "Au1x00 AC97 Port Driver"
depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
select SND_PCM select SND_PCM
select SND_AC97_CODEC select SND_AC97_CODEC
help help
ALSA Sound driver for the Au1x00's AC97 port. ALSA Sound driver for the Au1x00's AC97 port.
endmenu endif # SND_MIPS
# ALSA PA-RISC drivers # ALSA PA-RISC drivers
menu "GSC devices" menuconfig SND_GSC
depends on SND!=n && GSC bool "GSC sound devices"
depends on GSC
default y
help
Support for GSC sound devices on PA-RISC architectures.
if SND_GSC
config SND_HARMONY config SND_HARMONY
tristate "Harmony/Vivace sound chip" tristate "Harmony/Vivace sound chip"
depends on SND
select SND_PCM select SND_PCM
help help
Say 'Y' or 'M' to include support for the Harmony/Vivace sound Say 'Y' or 'M' to include support for the Harmony/Vivace sound
chip found in most GSC-based PA-RISC workstations. It's frequently chip found in most GSC-based PA-RISC workstations. It's frequently
provided as part of the Lasi multi-function IC. provided as part of the Lasi multi-function IC.
endmenu endif # SND_GSC
# ALSA PCI drivers # ALSA PCI drivers
menu "PCI devices" menuconfig SND_PCI
depends on SND!=n && PCI bool "PCI sound devices"
depends on PCI
default y
help
Support for sound devices connected via the PCI bus.
if SND_PCI
config SND_AD1889 config SND_AD1889
tristate "Analog Devices AD1889" tristate "Analog Devices AD1889"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the integrated AC97 sound Say Y here to include support for the integrated AC97 sound
...@@ -17,7 +22,6 @@ config SND_AD1889 ...@@ -17,7 +22,6 @@ config SND_AD1889
config SND_ALS300 config SND_ALS300
tristate "Avance Logic ALS300/ALS300+" tristate "Avance Logic ALS300/ALS300+"
depends on SND
select SND_PCM select SND_PCM
select SND_AC97_CODEC select SND_AC97_CODEC
select SND_OPL3_LIB select SND_OPL3_LIB
...@@ -29,7 +33,7 @@ config SND_ALS300 ...@@ -29,7 +33,7 @@ config SND_ALS300
config SND_ALS4000 config SND_ALS4000
tristate "Avance Logic ALS4000" tristate "Avance Logic ALS4000"
depends on SND && ISA_DMA_API depends on ISA_DMA_API
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -43,7 +47,6 @@ config SND_ALS4000 ...@@ -43,7 +47,6 @@ config SND_ALS4000
config SND_ALI5451 config SND_ALI5451
tristate "ALi M5451 PCI Audio Controller" tristate "ALi M5451 PCI Audio Controller"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -57,7 +60,6 @@ config SND_ALI5451 ...@@ -57,7 +60,6 @@ config SND_ALI5451
config SND_ATIIXP config SND_ATIIXP
tristate "ATI IXP AC97 Controller" tristate "ATI IXP AC97 Controller"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the integrated AC97 sound Say Y here to include support for the integrated AC97 sound
...@@ -69,7 +71,6 @@ config SND_ATIIXP ...@@ -69,7 +71,6 @@ config SND_ATIIXP
config SND_ATIIXP_MODEM config SND_ATIIXP_MODEM
tristate "ATI IXP Modem" tristate "ATI IXP Modem"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the integrated MC97 modem on Say Y here to include support for the integrated MC97 modem on
...@@ -80,7 +81,6 @@ config SND_ATIIXP_MODEM ...@@ -80,7 +81,6 @@ config SND_ATIIXP_MODEM
config SND_AU8810 config SND_AU8810
tristate "Aureal Advantage" tristate "Aureal Advantage"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -95,7 +95,6 @@ config SND_AU8810 ...@@ -95,7 +95,6 @@ config SND_AU8810
config SND_AU8820 config SND_AU8820
tristate "Aureal Vortex" tristate "Aureal Vortex"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -109,7 +108,6 @@ config SND_AU8820 ...@@ -109,7 +108,6 @@ config SND_AU8820
config SND_AU8830 config SND_AU8830
tristate "Aureal Vortex 2" tristate "Aureal Vortex 2"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -124,7 +122,6 @@ config SND_AU8830 ...@@ -124,7 +122,6 @@ config SND_AU8830
config SND_AW2 config SND_AW2
tristate "Emagic Audiowerk 2" tristate "Emagic Audiowerk 2"
depends on SND
help help
Say Y here to include support for Emagic Audiowerk 2 soundcards. Say Y here to include support for Emagic Audiowerk 2 soundcards.
...@@ -139,7 +136,7 @@ config SND_AW2 ...@@ -139,7 +136,7 @@ config SND_AW2
config SND_AZT3328 config SND_AZT3328
tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)" tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
depends on SND && EXPERIMENTAL depends on EXPERIMENTAL
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -152,7 +149,6 @@ config SND_AZT3328 ...@@ -152,7 +149,6 @@ config SND_AZT3328
config SND_BT87X config SND_BT87X
tristate "Bt87x Audio Capture" tristate "Bt87x Audio Capture"
depends on SND
select SND_PCM select SND_PCM
help help
If you want to record audio from TV cards based on If you want to record audio from TV cards based on
...@@ -174,7 +170,6 @@ config SND_BT87X_OVERCLOCK ...@@ -174,7 +170,6 @@ config SND_BT87X_OVERCLOCK
config SND_CA0106 config SND_CA0106
tristate "SB Audigy LS / Live 24bit" tristate "SB Audigy LS / Live 24bit"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
select SND_RAWMIDI select SND_RAWMIDI
select SND_VMASTER select SND_VMASTER
...@@ -187,7 +182,6 @@ config SND_CA0106 ...@@ -187,7 +182,6 @@ config SND_CA0106
config SND_CMIPCI config SND_CMIPCI
tristate "C-Media 8338, 8738, 8768, 8770" tristate "C-Media 8338, 8738, 8768, 8770"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
...@@ -201,13 +195,11 @@ config SND_CMIPCI ...@@ -201,13 +195,11 @@ config SND_CMIPCI
config SND_OXYGEN_LIB config SND_OXYGEN_LIB
tristate tristate
depends on SND
select SND_PCM select SND_PCM
select SND_MPU401_UART select SND_MPU401_UART
config SND_OXYGEN config SND_OXYGEN
tristate "C-Media 8788 (Oxygen)" tristate "C-Media 8788 (Oxygen)"
depends on SND
select SND_OXYGEN_LIB select SND_OXYGEN_LIB
help help
Say Y here to include support for sound cards based on the Say Y here to include support for sound cards based on the
...@@ -225,7 +217,6 @@ config SND_OXYGEN ...@@ -225,7 +217,6 @@ config SND_OXYGEN
config SND_CS4281 config SND_CS4281
tristate "Cirrus Logic (Sound Fusion) CS4281" tristate "Cirrus Logic (Sound Fusion) CS4281"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_RAWMIDI select SND_RAWMIDI
select SND_AC97_CODEC select SND_AC97_CODEC
...@@ -237,7 +228,6 @@ config SND_CS4281 ...@@ -237,7 +228,6 @@ config SND_CS4281
config SND_CS46XX config SND_CS46XX
tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x" tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -258,7 +248,7 @@ config SND_CS46XX_NEW_DSP ...@@ -258,7 +248,7 @@ config SND_CS46XX_NEW_DSP
config SND_CS5530 config SND_CS5530
tristate "CS5530 Audio" tristate "CS5530 Audio"
depends on SND && ISA_DMA_API depends on ISA_DMA_API
select SND_SB16_DSP select SND_SB16_DSP
help help
Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips. Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.
...@@ -268,7 +258,7 @@ config SND_CS5530 ...@@ -268,7 +258,7 @@ config SND_CS5530
config SND_CS5535AUDIO config SND_CS5535AUDIO
tristate "CS5535/CS5536 Audio" tristate "CS5535/CS5536 Audio"
depends on SND && X86 && !X86_64 depends on X86 && !X86_64
select SND_PCM select SND_PCM
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -286,7 +276,6 @@ config SND_CS5535AUDIO ...@@ -286,7 +276,6 @@ config SND_CS5535AUDIO
config SND_DARLA20 config SND_DARLA20
tristate "(Echoaudio) Darla20" tristate "(Echoaudio) Darla20"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -297,7 +286,6 @@ config SND_DARLA20 ...@@ -297,7 +286,6 @@ config SND_DARLA20
config SND_GINA20 config SND_GINA20
tristate "(Echoaudio) Gina20" tristate "(Echoaudio) Gina20"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -308,7 +296,6 @@ config SND_GINA20 ...@@ -308,7 +296,6 @@ config SND_GINA20
config SND_LAYLA20 config SND_LAYLA20
tristate "(Echoaudio) Layla20" tristate "(Echoaudio) Layla20"
depends on SND
select FW_LOADER select FW_LOADER
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -320,7 +307,6 @@ config SND_LAYLA20 ...@@ -320,7 +307,6 @@ config SND_LAYLA20
config SND_DARLA24 config SND_DARLA24
tristate "(Echoaudio) Darla24" tristate "(Echoaudio) Darla24"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -331,7 +317,6 @@ config SND_DARLA24 ...@@ -331,7 +317,6 @@ config SND_DARLA24
config SND_GINA24 config SND_GINA24
tristate "(Echoaudio) Gina24" tristate "(Echoaudio) Gina24"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -342,7 +327,6 @@ config SND_GINA24 ...@@ -342,7 +327,6 @@ config SND_GINA24
config SND_LAYLA24 config SND_LAYLA24
tristate "(Echoaudio) Layla24" tristate "(Echoaudio) Layla24"
depends on SND
select FW_LOADER select FW_LOADER
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -354,7 +338,6 @@ config SND_LAYLA24 ...@@ -354,7 +338,6 @@ config SND_LAYLA24
config SND_MONA config SND_MONA
tristate "(Echoaudio) Mona" tristate "(Echoaudio) Mona"
depends on SND
select FW_LOADER select FW_LOADER
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -366,7 +349,6 @@ config SND_MONA ...@@ -366,7 +349,6 @@ config SND_MONA
config SND_MIA config SND_MIA
tristate "(Echoaudio) Mia" tristate "(Echoaudio) Mia"
depends on SND
select FW_LOADER select FW_LOADER
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -378,7 +360,6 @@ config SND_MIA ...@@ -378,7 +360,6 @@ config SND_MIA
config SND_ECHO3G config SND_ECHO3G
tristate "(Echoaudio) 3G cards" tristate "(Echoaudio) 3G cards"
depends on SND
select FW_LOADER select FW_LOADER
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -390,7 +371,6 @@ config SND_ECHO3G ...@@ -390,7 +371,6 @@ config SND_ECHO3G
config SND_INDIGO config SND_INDIGO
tristate "(Echoaudio) Indigo" tristate "(Echoaudio) Indigo"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -401,7 +381,6 @@ config SND_INDIGO ...@@ -401,7 +381,6 @@ config SND_INDIGO
config SND_INDIGOIO config SND_INDIGOIO
tristate "(Echoaudio) Indigo IO" tristate "(Echoaudio) Indigo IO"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -412,7 +391,6 @@ config SND_INDIGOIO ...@@ -412,7 +391,6 @@ config SND_INDIGOIO
config SND_INDIGODJ config SND_INDIGODJ
tristate "(Echoaudio) Indigo DJ" tristate "(Echoaudio) Indigo DJ"
depends on SND
select FW_LOADER select FW_LOADER
select SND_PCM select SND_PCM
help help
...@@ -423,7 +401,6 @@ config SND_INDIGODJ ...@@ -423,7 +401,6 @@ config SND_INDIGODJ
config SND_EMU10K1 config SND_EMU10K1
tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)" tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)"
depends on SND
select FW_LOADER select FW_LOADER
select SND_HWDEP select SND_HWDEP
select SND_RAWMIDI select SND_RAWMIDI
...@@ -441,7 +418,6 @@ config SND_EMU10K1 ...@@ -441,7 +418,6 @@ config SND_EMU10K1
config SND_EMU10K1X config SND_EMU10K1X
tristate "Emu10k1X (Dell OEM Version)" tristate "Emu10k1X (Dell OEM Version)"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
select SND_RAWMIDI select SND_RAWMIDI
help help
...@@ -453,7 +429,6 @@ config SND_EMU10K1X ...@@ -453,7 +429,6 @@ config SND_EMU10K1X
config SND_ENS1370 config SND_ENS1370
tristate "(Creative) Ensoniq AudioPCI 1370" tristate "(Creative) Ensoniq AudioPCI 1370"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
help help
...@@ -464,7 +439,6 @@ config SND_ENS1370 ...@@ -464,7 +439,6 @@ config SND_ENS1370
config SND_ENS1371 config SND_ENS1371
tristate "(Creative) Ensoniq AudioPCI 1371/1373" tristate "(Creative) Ensoniq AudioPCI 1371/1373"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -476,7 +450,6 @@ config SND_ENS1371 ...@@ -476,7 +450,6 @@ config SND_ENS1371
config SND_ES1938 config SND_ES1938
tristate "ESS ES1938/1946/1969 (Solo-1)" tristate "ESS ES1938/1946/1969 (Solo-1)"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
...@@ -489,7 +462,6 @@ config SND_ES1938 ...@@ -489,7 +462,6 @@ config SND_ES1938
config SND_ES1968 config SND_ES1968
tristate "ESS ES1968/1978 (Maestro-1/2/2E)" tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -501,7 +473,6 @@ config SND_ES1968 ...@@ -501,7 +473,6 @@ config SND_ES1968
config SND_FM801 config SND_FM801
tristate "ForteMedia FM801" tristate "ForteMedia FM801"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
...@@ -528,7 +499,6 @@ config SND_FM801_TEA575X ...@@ -528,7 +499,6 @@ config SND_FM801_TEA575X
config SND_HDA_INTEL config SND_HDA_INTEL
tristate "Intel HD Audio" tristate "Intel HD Audio"
depends on SND
select SND_PCM select SND_PCM
select SND_VMASTER select SND_VMASTER
help help
...@@ -637,7 +607,6 @@ config SND_HDA_POWER_SAVE_DEFAULT ...@@ -637,7 +607,6 @@ config SND_HDA_POWER_SAVE_DEFAULT
config SND_HDSP config SND_HDSP
tristate "RME Hammerfall DSP Audio" tristate "RME Hammerfall DSP Audio"
depends on SND
select SND_HWDEP select SND_HWDEP
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -650,7 +619,6 @@ config SND_HDSP ...@@ -650,7 +619,6 @@ config SND_HDSP
config SND_HDSPM config SND_HDSPM
tristate "RME Hammerfall DSP MADI" tristate "RME Hammerfall DSP MADI"
depends on SND
select SND_HWDEP select SND_HWDEP
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -663,7 +631,6 @@ config SND_HDSPM ...@@ -663,7 +631,6 @@ config SND_HDSPM
config SND_HIFIER config SND_HIFIER
tristate "TempoTec HiFier Fantasia" tristate "TempoTec HiFier Fantasia"
depends on SND
select SND_OXYGEN_LIB select SND_OXYGEN_LIB
help help
Say Y here to include support for the MediaTek/TempoTec HiFier Say Y here to include support for the MediaTek/TempoTec HiFier
...@@ -674,7 +641,6 @@ config SND_HIFIER ...@@ -674,7 +641,6 @@ config SND_HIFIER
config SND_ICE1712 config SND_ICE1712
tristate "ICEnsemble ICE1712 (Envy24)" tristate "ICEnsemble ICE1712 (Envy24)"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -691,7 +657,6 @@ config SND_ICE1712 ...@@ -691,7 +657,6 @@ config SND_ICE1712
config SND_ICE1724 config SND_ICE1724
tristate "ICE/VT1724/1720 (Envy24HT/PT)" tristate "ICE/VT1724/1720 (Envy24HT/PT)"
depends on SND
select SND_RAWMIDI select SND_RAWMIDI
select SND_AC97_CODEC select SND_AC97_CODEC
select SND_VMASTER select SND_VMASTER
...@@ -709,7 +674,6 @@ config SND_ICE1724 ...@@ -709,7 +674,6 @@ config SND_ICE1724
config SND_INTEL8X0 config SND_INTEL8X0
tristate "Intel/SiS/nVidia/AMD/ALi AC97 Controller" tristate "Intel/SiS/nVidia/AMD/ALi AC97 Controller"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the integrated AC97 sound Say Y here to include support for the integrated AC97 sound
...@@ -722,7 +686,6 @@ config SND_INTEL8X0 ...@@ -722,7 +686,6 @@ config SND_INTEL8X0
config SND_INTEL8X0M config SND_INTEL8X0M
tristate "Intel/SiS/nVidia/AMD MC97 Modem" tristate "Intel/SiS/nVidia/AMD MC97 Modem"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the integrated MC97 modem on Say Y here to include support for the integrated MC97 modem on
...@@ -733,7 +696,6 @@ config SND_INTEL8X0M ...@@ -733,7 +696,6 @@ config SND_INTEL8X0M
config SND_KORG1212 config SND_KORG1212
tristate "Korg 1212 IO" tristate "Korg 1212 IO"
depends on SND
select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
select SND_PCM select SND_PCM
help help
...@@ -753,7 +715,6 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL ...@@ -753,7 +715,6 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL
config SND_MAESTRO3 config SND_MAESTRO3
tristate "ESS Allegro/Maestro3" tristate "ESS Allegro/Maestro3"
depends on SND
select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -774,7 +735,6 @@ config SND_MAESTRO3_FIRMWARE_IN_KERNEL ...@@ -774,7 +735,6 @@ config SND_MAESTRO3_FIRMWARE_IN_KERNEL
config SND_MIXART config SND_MIXART
tristate "Digigram miXart" tristate "Digigram miXart"
depends on SND
select SND_HWDEP select SND_HWDEP
select SND_PCM select SND_PCM
help help
...@@ -786,7 +746,6 @@ config SND_MIXART ...@@ -786,7 +746,6 @@ config SND_MIXART
config SND_NM256 config SND_NM256
tristate "NeoMagic NM256AV/ZX" tristate "NeoMagic NM256AV/ZX"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for NeoMagic NM256AV/ZX chips. Say Y here to include support for NeoMagic NM256AV/ZX chips.
...@@ -796,7 +755,6 @@ config SND_NM256 ...@@ -796,7 +755,6 @@ config SND_NM256
config SND_PCXHR config SND_PCXHR
tristate "Digigram PCXHR" tristate "Digigram PCXHR"
depends on SND
select SND_PCM select SND_PCM
select SND_HWDEP select SND_HWDEP
help help
...@@ -807,7 +765,6 @@ config SND_PCXHR ...@@ -807,7 +765,6 @@ config SND_PCXHR
config SND_RIPTIDE config SND_RIPTIDE
tristate "Conexant Riptide" tristate "Conexant Riptide"
depends on SND
select FW_LOADER select FW_LOADER
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -820,7 +777,6 @@ config SND_RIPTIDE ...@@ -820,7 +777,6 @@ config SND_RIPTIDE
config SND_RME32 config SND_RME32
tristate "RME Digi32, 32/8, 32 PRO" tristate "RME Digi32, 32/8, 32 PRO"
depends on SND
select SND_PCM select SND_PCM
help help
Say Y to include support for RME Digi32, Digi32 PRO and Say Y to include support for RME Digi32, Digi32 PRO and
...@@ -832,7 +788,6 @@ config SND_RME32 ...@@ -832,7 +788,6 @@ config SND_RME32
config SND_RME96 config SND_RME96
tristate "RME Digi96, 96/8, 96/8 PRO" tristate "RME Digi96, 96/8, 96/8 PRO"
depends on SND
select SND_PCM select SND_PCM
help help
Say Y here to include support for RME Digi96, Digi96/8 and Say Y here to include support for RME Digi96, Digi96/8 and
...@@ -843,7 +798,6 @@ config SND_RME96 ...@@ -843,7 +798,6 @@ config SND_RME96
config SND_RME9652 config SND_RME9652
tristate "RME Digi9652 (Hammerfall)" tristate "RME Digi9652 (Hammerfall)"
depends on SND
select SND_PCM select SND_PCM
help help
Say Y here to include support for RME Hammerfall (RME Say Y here to include support for RME Hammerfall (RME
...@@ -854,7 +808,7 @@ config SND_RME9652 ...@@ -854,7 +808,7 @@ config SND_RME9652
config SND_SIS7019 config SND_SIS7019
tristate "SiS 7019 Audio Accelerator" tristate "SiS 7019 Audio Accelerator"
depends on SND && X86 && !X86_64 depends on X86 && !X86_64
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the SiS 7019 Audio Accelerator. Say Y here to include support for the SiS 7019 Audio Accelerator.
...@@ -864,7 +818,6 @@ config SND_SIS7019 ...@@ -864,7 +818,6 @@ config SND_SIS7019
config SND_SONICVIBES config SND_SONICVIBES
tristate "S3 SonicVibes" tristate "S3 SonicVibes"
depends on SND
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
...@@ -877,7 +830,6 @@ config SND_SONICVIBES ...@@ -877,7 +830,6 @@ config SND_SONICVIBES
config SND_TRIDENT config SND_TRIDENT
tristate "Trident 4D-Wave DX/NX; SiS 7018" tristate "Trident 4D-Wave DX/NX; SiS 7018"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -889,7 +841,6 @@ config SND_TRIDENT ...@@ -889,7 +841,6 @@ config SND_TRIDENT
config SND_VIA82XX config SND_VIA82XX
tristate "VIA 82C686A/B, 8233/8235 AC97 Controller" tristate "VIA 82C686A/B, 8233/8235 AC97 Controller"
depends on SND
select SND_MPU401_UART select SND_MPU401_UART
select SND_AC97_CODEC select SND_AC97_CODEC
help help
...@@ -901,7 +852,6 @@ config SND_VIA82XX ...@@ -901,7 +852,6 @@ config SND_VIA82XX
config SND_VIA82XX_MODEM config SND_VIA82XX_MODEM
tristate "VIA 82C686A/B, 8233 based Modems" tristate "VIA 82C686A/B, 8233 based Modems"
depends on SND
select SND_AC97_CODEC select SND_AC97_CODEC
help help
Say Y here to include support for the integrated MC97 modem on Say Y here to include support for the integrated MC97 modem on
...@@ -912,7 +862,6 @@ config SND_VIA82XX_MODEM ...@@ -912,7 +862,6 @@ config SND_VIA82XX_MODEM
config SND_VIRTUOSO config SND_VIRTUOSO
tristate "Asus Virtuoso 100/200 (Xonar)" tristate "Asus Virtuoso 100/200 (Xonar)"
depends on SND
select SND_OXYGEN_LIB select SND_OXYGEN_LIB
help help
Say Y here to include support for sound cards based on the Say Y here to include support for sound cards based on the
...@@ -923,7 +872,6 @@ config SND_VIRTUOSO ...@@ -923,7 +872,6 @@ config SND_VIRTUOSO
config SND_VX222 config SND_VX222
tristate "Digigram VX222" tristate "Digigram VX222"
depends on SND
select SND_VX_LIB select SND_VX_LIB
help help
Say Y here to include support for Digigram VX222 soundcards. Say Y here to include support for Digigram VX222 soundcards.
...@@ -933,7 +881,6 @@ config SND_VX222 ...@@ -933,7 +881,6 @@ config SND_VX222
config SND_YMFPCI config SND_YMFPCI
tristate "Yamaha YMF724/740/744/754" tristate "Yamaha YMF724/740/744/754"
depends on SND
select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
...@@ -975,4 +922,4 @@ config SND_AC97_POWER_SAVE_DEFAULT ...@@ -975,4 +922,4 @@ config SND_AC97_POWER_SAVE_DEFAULT
The default time-out value in seconds for AC97 automatic The default time-out value in seconds for AC97 automatic
power-save mode. 0 means to disable the power-save mode. power-save mode. 0 means to disable the power-save mode.
endmenu endif # SND_PCI
# ALSA PCMCIA drivers # ALSA PCMCIA drivers
menu "PCMCIA devices" menuconfig SND_PCMCIA
depends on SND!=n && PCMCIA bool "PCMCIA sound devices"
depends on PCMCIA
default y
help
Support for sound devices connected via the PCMCIA bus.
if SND_PCMCIA && PCMCIA
config SND_VXPOCKET config SND_VXPOCKET
tristate "Digigram VXpocket" tristate "Digigram VXpocket"
depends on SND && PCMCIA
select SND_VX_LIB select SND_VX_LIB
help help
Say Y here to include support for Digigram VXpocket and Say Y here to include support for Digigram VXpocket and
...@@ -16,7 +21,6 @@ config SND_VXPOCKET ...@@ -16,7 +21,6 @@ config SND_VXPOCKET
config SND_PDAUDIOCF config SND_PDAUDIOCF
tristate "Sound Core PDAudioCF" tristate "Sound Core PDAudioCF"
depends on SND && PCMCIA
select SND_PCM select SND_PCM
help help
Say Y here to include support for Sound Core PDAudioCF Say Y here to include support for Sound Core PDAudioCF
...@@ -25,4 +29,5 @@ config SND_PDAUDIOCF ...@@ -25,4 +29,5 @@ config SND_PDAUDIOCF
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-pdaudiocf. will be called snd-pdaudiocf.
endmenu endif # SND_PCMCIA
# ALSA PowerMac drivers # ALSA PowerMac drivers
menu "ALSA PowerMac devices" menuconfig SND_PPC
depends on SND!=n && PPC bool "PowerPC sound devices"
depends on PPC64 || PPC32
comment "ALSA PowerMac requires I2C" default y
depends on SND && I2C=n help
Support for sound devices specific to PowerPC architectures.
comment "ALSA PowerMac requires INPUT" if SND_PPC
depends on SND && INPUT=n
config SND_POWERMAC config SND_POWERMAC
tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
depends on SND && I2C && INPUT && PPC_PMAC depends on I2C && INPUT && PPC_PMAC
select SND_PCM select SND_PCM
help help
Say Y here to include support for the integrated sound device. Say Y here to include support for the integrated sound device.
...@@ -32,14 +32,9 @@ config SND_POWERMAC_AUTO_DRC ...@@ -32,14 +32,9 @@ config SND_POWERMAC_AUTO_DRC
Note that you can turn on/off DRC manually even without this Note that you can turn on/off DRC manually even without this
option. option.
endmenu
menu "ALSA PowerPC devices"
depends on SND!=n && ( PPC64 || PPC32 )
config SND_PS3 config SND_PS3
tristate "PS3 Audio support" tristate "PS3 Audio support"
depends on SND && PS3_PS3AV depends on PS3_PS3AV
select SND_PCM select SND_PCM
default m default m
help help
...@@ -52,4 +47,5 @@ config SND_PS3_DEFAULT_START_DELAY ...@@ -52,4 +47,5 @@ config SND_PS3_DEFAULT_START_DELAY
int "Startup delay time in ms" int "Startup delay time in ms"
depends on SND_PS3 depends on SND_PS3
default "2000" default "2000"
endmenu
endif # SND_PPC
# ALSA SH drivers # ALSA SH drivers
menu "SUPERH devices" menuconfig SND_SUPERH
depends on SND!=n && SUPERH bool "SUPERH sound devices"
depends on SUPERH
default y
help
Support for sound devices specific to SUPERH architectures.
Drivers that are implemented on ASoC can be found in
"ALSA for SoC audio support" section.
if SND_SUPERH
config SND_AICA config SND_AICA
tristate "Dreamcast Yamaha AICA sound" tristate "Dreamcast Yamaha AICA sound"
depends on SH_DREAMCAST && SND depends on SH_DREAMCAST
select SND_PCM select SND_PCM
help help
ALSA Sound driver for the SEGA Dreamcast console. ALSA Sound driver for the SEGA Dreamcast console.
endmenu endif # SND_SUPERH
...@@ -2,15 +2,8 @@ ...@@ -2,15 +2,8 @@
# SoC audio configuration # SoC audio configuration
# #
menu "System on Chip audio support" menuconfig SND_SOC
depends on SND!=n
config SND_SOC_AC97_BUS
bool
config SND_SOC
tristate "ALSA for SoC audio support" tristate "ALSA for SoC audio support"
depends on SND
select SND_PCM select SND_PCM
---help--- ---help---
...@@ -23,6 +16,11 @@ config SND_SOC ...@@ -23,6 +16,11 @@ config SND_SOC
This ASoC audio support can also be built as a module. If so, the module This ASoC audio support can also be built as a module. If so, the module
will be called snd-soc-core. will be called snd-soc-core.
if SND_SOC
config SND_SOC_AC97_BUS
bool
# All the supported Soc's # All the supported Soc's
source "sound/soc/at91/Kconfig" source "sound/soc/at91/Kconfig"
source "sound/soc/pxa/Kconfig" source "sound/soc/pxa/Kconfig"
...@@ -35,4 +33,5 @@ source "sound/soc/omap/Kconfig" ...@@ -35,4 +33,5 @@ source "sound/soc/omap/Kconfig"
# Supported codecs # Supported codecs
source "sound/soc/codecs/Kconfig" source "sound/soc/codecs/Kconfig"
endmenu endif # SND_SOC
config SND_AT91_SOC config SND_AT91_SOC
tristate "SoC Audio for the Atmel AT91 System-on-Chip" tristate "SoC Audio for the Atmel AT91 System-on-Chip"
depends on ARCH_AT91 && SND_SOC depends on ARCH_AT91
help help
Say Y or M if you want to add support for codecs attached to Say Y or M if you want to add support for codecs attached to
the AT91 SSC interface. You will also need the AT91 SSC interface. You will also need
......
config SND_SOC_AC97_CODEC config SND_SOC_AC97_CODEC
tristate tristate
depends on SND_SOC select SND_AC97_CODEC
config SND_SOC_WM8731 config SND_SOC_WM8731
tristate tristate
depends on SND_SOC
config SND_SOC_WM8750 config SND_SOC_WM8750
tristate tristate
depends on SND_SOC
config SND_SOC_WM8753 config SND_SOC_WM8753
tristate tristate
depends on SND_SOC
config SND_SOC_WM9712 config SND_SOC_WM9712
tristate tristate
depends on SND_SOC
config SND_SOC_WM9713 config SND_SOC_WM9713
tristate tristate
depends on SND_SOC
# Cirrus Logic CS4270 Codec # Cirrus Logic CS4270 Codec
config SND_SOC_CS4270 config SND_SOC_CS4270
tristate tristate
depends on SND_SOC
# Cirrus Logic CS4270 Codec Hardware Mute Support # Cirrus Logic CS4270 Codec Hardware Mute Support
# Select if you have external muting circuitry attached to your CS4270. # Select if you have external muting circuitry attached to your CS4270.
...@@ -43,4 +37,4 @@ config SND_SOC_CS4270_VD33_ERRATA ...@@ -43,4 +37,4 @@ config SND_SOC_CS4270_VD33_ERRATA
config SND_SOC_TLV320AIC3X config SND_SOC_TLV320AIC3X
tristate tristate
depends on SND_SOC && I2C depends on I2C
config SND_DAVINCI_SOC config SND_DAVINCI_SOC
tristate "SoC Audio for the TI DAVINCI chip" tristate "SoC Audio for the TI DAVINCI chip"
depends on ARCH_DAVINCI && SND_SOC depends on ARCH_DAVINCI
help help
Say Y or M if you want to add support for codecs attached to Say Y or M if you want to add support for codecs attached to
the DAVINCI AC97 or I2S interface. You will also need the DAVINCI AC97 or I2S interface. You will also need
......
...@@ -2,7 +2,7 @@ menu "ALSA SoC audio for Freescale SOCs" ...@@ -2,7 +2,7 @@ menu "ALSA SoC audio for Freescale SOCs"
config SND_SOC_MPC8610 config SND_SOC_MPC8610
bool "ALSA SoC support for the MPC8610 SOC" bool "ALSA SoC support for the MPC8610 SOC"
depends on SND_SOC && MPC8610_HPCD depends on MPC8610_HPCD
default y if MPC8610 default y if MPC8610
help help
Say Y if you want to add support for codecs attached to the SSI Say Y if you want to add support for codecs attached to the SSI
......
config SND_PXA2XX_SOC config SND_PXA2XX_SOC
tristate "SoC Audio for the Intel PXA2xx chip" tristate "SoC Audio for the Intel PXA2xx chip"
depends on ARCH_PXA && SND_SOC depends on ARCH_PXA
help help
Say Y or M if you want to add support for codecs attached to Say Y or M if you want to add support for codecs attached to
the PXA2xx AC97, I2S or SSP interface. You will also need the PXA2xx AC97, I2S or SSP interface. You will also need
......
config SND_S3C24XX_SOC config SND_S3C24XX_SOC
tristate "SoC Audio for the Samsung S3C24XX chips" tristate "SoC Audio for the Samsung S3C24XX chips"
depends on ARCH_S3C2410 && SND_SOC depends on ARCH_S3C2410
select SND_PCM
help help
Say Y or M if you want to add support for codecs attached to Say Y or M if you want to add support for codecs attached to
the S3C24XX AC97, I2S or SSP interface. You will also need the S3C24XX AC97, I2S or SSP interface. You will also need
...@@ -16,7 +15,6 @@ config SND_S3C2412_SOC_I2S ...@@ -16,7 +15,6 @@ config SND_S3C2412_SOC_I2S
config SND_S3C2443_SOC_AC97 config SND_S3C2443_SOC_AC97
tristate tristate
select AC97_BUS select AC97_BUS
select SND_AC97_CODEC
select SND_SOC_AC97_BUS select SND_SOC_AC97_BUS
config SND_S3C24XX_SOC_NEO1973_WM8753 config SND_S3C24XX_SOC_NEO1973_WM8753
......
...@@ -3,7 +3,7 @@ menu "SoC Audio support for SuperH" ...@@ -3,7 +3,7 @@ menu "SoC Audio support for SuperH"
config SND_SOC_PCM_SH7760 config SND_SOC_PCM_SH7760
tristate "SoC Audio support for Renesas SH7760" tristate "SoC Audio support for Renesas SH7760"
depends on CPU_SUBTYPE_SH7760 && SND_SOC && SH_DMABRG depends on CPU_SUBTYPE_SH7760 && SH_DMABRG
help help
Enable this option for SH7760 AC97/I2S audio support. Enable this option for SH7760 AC97/I2S audio support.
...@@ -13,10 +13,9 @@ config SND_SOC_PCM_SH7760 ...@@ -13,10 +13,9 @@ config SND_SOC_PCM_SH7760
## ##
config SND_SOC_SH4_HAC config SND_SOC_SH4_HAC
tristate
select AC97_BUS select AC97_BUS
select SND_SOC_AC97_BUS select SND_SOC_AC97_BUS
select SND_AC97_CODEC
tristate
config SND_SOC_SH4_SSI config SND_SOC_SH4_SSI
tristate tristate
......
# ALSA Sparc drivers # ALSA Sparc drivers
menu "ALSA Sparc devices" menuconfig SND_SPARC
depends on SND!=n && SPARC bool "Sparc sound devices"
depends on SPARC
default y
help
Support for sound devices specific to Sun SPARC architectures.
if SND_SPARC
config SND_SUN_AMD7930 config SND_SUN_AMD7930
tristate "Sun AMD7930" tristate "Sun AMD7930"
depends on SBUS && SND depends on SBUS
select SND_PCM select SND_PCM
help help
Say Y here to include support for AMD7930 sound device on Sun. Say Y here to include support for AMD7930 sound device on Sun.
...@@ -15,7 +21,6 @@ config SND_SUN_AMD7930 ...@@ -15,7 +21,6 @@ config SND_SUN_AMD7930
config SND_SUN_CS4231 config SND_SUN_CS4231
tristate "Sun CS4231" tristate "Sun CS4231"
depends on SND
select SND_PCM select SND_PCM
help help
Say Y here to include support for CS4231 sound device on Sun. Say Y here to include support for CS4231 sound device on Sun.
...@@ -25,7 +30,7 @@ config SND_SUN_CS4231 ...@@ -25,7 +30,7 @@ config SND_SUN_CS4231
config SND_SUN_DBRI config SND_SUN_DBRI
tristate "Sun DBRI" tristate "Sun DBRI"
depends on SND && SBUS depends on SBUS
select SND_PCM select SND_PCM
help help
Say Y here to include support for DBRI sound device on Sun. Say Y here to include support for DBRI sound device on Sun.
...@@ -33,4 +38,4 @@ config SND_SUN_DBRI ...@@ -33,4 +38,4 @@ config SND_SUN_DBRI
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-sun-dbri. will be called snd-sun-dbri.
endmenu endif # SND_SPARC
#SPI drivers #SPI drivers
menu "SPI devices" menuconfig SND_SPI
depends on SND != n bool "SPI sound devices"
depends on SPI
default y
help
Support for sound devices connected via the SPI bus.
if SND_SPI
config SND_AT73C213 config SND_AT73C213
tristate "Atmel AT73C213 DAC driver" tristate "Atmel AT73C213 DAC driver"
...@@ -28,4 +34,5 @@ config SND_AT73C213_TARGET_BITRATE ...@@ -28,4 +34,5 @@ config SND_AT73C213_TARGET_BITRATE
Set to 48000 Hz by default. Set to 48000 Hz by default.
endmenu endif # SND_SPI
# ALSA USB drivers # ALSA USB drivers
menu "USB devices" menuconfig SND_USB
depends on SND!=n && USB!=n bool "USB sound devices"
depends on USB
default y
help
Support for sound devices connected via the USB bus.
if SND_USB && USB
config SND_USB_AUDIO config SND_USB_AUDIO
tristate "USB Audio/MIDI driver" tristate "USB Audio/MIDI driver"
depends on SND && USB
select SND_HWDEP select SND_HWDEP
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -18,7 +23,7 @@ config SND_USB_AUDIO ...@@ -18,7 +23,7 @@ config SND_USB_AUDIO
config SND_USB_USX2Y config SND_USB_USX2Y
tristate "Tascam US-122, US-224 and US-428 USB driver" tristate "Tascam US-122, US-224 and US-428 USB driver"
depends on SND && USB && (X86 || PPC || ALPHA) depends on X86 || PPC || ALPHA
select SND_HWDEP select SND_HWDEP
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -31,7 +36,6 @@ config SND_USB_USX2Y ...@@ -31,7 +36,6 @@ config SND_USB_USX2Y
config SND_USB_CAIAQ config SND_USB_CAIAQ
tristate "Native Instruments USB audio devices" tristate "Native Instruments USB audio devices"
depends on SND && USB
select SND_HWDEP select SND_HWDEP
select SND_RAWMIDI select SND_RAWMIDI
select SND_PCM select SND_PCM
...@@ -63,5 +67,5 @@ config SND_USB_CAIAQ_INPUT ...@@ -63,5 +67,5 @@ config SND_USB_CAIAQ_INPUT
* Native Instruments Kore Controller 2 * Native Instruments Kore Controller 2
* Native Instruments Audio Kontrol 1 * Native Instruments Audio Kontrol 1
endmenu endif # SND_USB
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