aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sound/Kconfig34
-rw-r--r--sound/aoa/Kconfig11
-rw-r--r--sound/aoa/codecs/Kconfig4
-rw-r--r--sound/aoa/fabrics/Kconfig1
-rw-r--r--sound/aoa/soundbus/Kconfig1
-rw-r--r--sound/arm/Kconfig21
-rw-r--r--sound/core/Kconfig19
-rw-r--r--sound/drivers/Kconfig71
-rw-r--r--sound/isa/Kconfig51
-rw-r--r--sound/mips/Kconfig14
-rw-r--r--sound/parisc/Kconfig13
-rw-r--r--sound/pci/Kconfig81
-rw-r--r--sound/pcmcia/Kconfig15
-rw-r--r--sound/ppc/Kconfig26
-rw-r--r--sound/sh/Kconfig16
-rw-r--r--sound/soc/Kconfig17
-rw-r--r--sound/soc/at91/Kconfig2
-rw-r--r--sound/soc/codecs/Kconfig10
-rw-r--r--sound/soc/davinci/Kconfig2
-rw-r--r--sound/soc/fsl/Kconfig2
-rw-r--r--sound/soc/pxa/Kconfig2
-rw-r--r--sound/soc/s3c24xx/Kconfig4
-rw-r--r--sound/soc/sh/Kconfig5
-rw-r--r--sound/sparc/Kconfig17
-rw-r--r--sound/spi/Kconfig13
-rw-r--r--sound/usb/Kconfig16
26 files changed, 203 insertions, 265 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index 4247406160e7..a37bee094eba 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -1,11 +1,9 @@
1# sound/Config.in 1# sound/Config.in
2# 2#
3 3
4menu "Sound" 4menuconfig SOUND
5 depends on HAS_IOMEM
6
7config SOUND
8 tristate "Sound card support" 5 tristate "Sound card support"
6 depends on HAS_IOMEM
9 help 7 help
10 If you have a sound card in your computer, i.e. if it can say more 8 If you have a sound card in your computer, i.e. if it can say more
11 than an occasional beep, say Y. Be sure to have all the information 9 than an occasional beep, say Y. Be sure to have all the information
@@ -28,22 +26,22 @@ config SOUND
28 and read <file:Documentation/sound/oss/README.modules>; the module 26 and read <file:Documentation/sound/oss/README.modules>; the module
29 will be called soundcore. 27 will be called soundcore.
30 28
29if SOUND
30
31source "sound/oss/dmasound/Kconfig" 31source "sound/oss/dmasound/Kconfig"
32 32
33if !M68K 33if !M68K
34 34
35menu "Advanced Linux Sound Architecture" 35menuconfig SND
36 depends on SOUND!=n
37
38config SND
39 tristate "Advanced Linux Sound Architecture" 36 tristate "Advanced Linux Sound Architecture"
40 depends on SOUND
41 help 37 help
42 Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture), 38 Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture),
43 the new base sound system. 39 the new base sound system.
44 40
45 For more information, see <http://www.alsa-project.org/> 41 For more information, see <http://www.alsa-project.org/>
46 42
43if SND
44
47source "sound/core/Kconfig" 45source "sound/core/Kconfig"
48 46
49source "sound/drivers/Kconfig" 47source "sound/drivers/Kconfig"
@@ -58,9 +56,7 @@ source "sound/aoa/Kconfig"
58 56
59source "sound/arm/Kconfig" 57source "sound/arm/Kconfig"
60 58
61if SPI
62source "sound/spi/Kconfig" 59source "sound/spi/Kconfig"
63endif
64 60
65source "sound/mips/Kconfig" 61source "sound/mips/Kconfig"
66 62
@@ -80,22 +76,20 @@ source "sound/parisc/Kconfig"
80 76
81source "sound/soc/Kconfig" 77source "sound/soc/Kconfig"
82 78
83endmenu 79endif # SND
84 80
85menu "Open Sound System" 81menuconfig SOUND_PRIME
86 depends on SOUND!=n
87
88config SOUND_PRIME
89 tristate "Open Sound System (DEPRECATED)" 82 tristate "Open Sound System (DEPRECATED)"
90 depends on SOUND
91 help 83 help
92 Say 'Y' or 'M' to enable Open Sound System drivers. 84 Say 'Y' or 'M' to enable Open Sound System drivers.
93 85
86if SOUND_PRIME
87
94source "sound/oss/Kconfig" 88source "sound/oss/Kconfig"
95 89
96endmenu 90endif # SOUND_PRIME
97 91
98endif 92endif # !M68K
99 93
100config AC97_BUS 94config AC97_BUS
101 tristate 95 tristate
@@ -105,4 +99,4 @@ config AC97_BUS
105 sound although they're sharing the AC97 bus. Concerned drivers 99 sound although they're sharing the AC97 bus. Concerned drivers
106 should "select" this. 100 should "select" this.
107 101
108endmenu 102endif # SOUND
diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig
index 5d5813cec4c8..c081e18b9540 100644
--- a/sound/aoa/Kconfig
+++ b/sound/aoa/Kconfig
@@ -1,18 +1,17 @@
1menu "Apple Onboard Audio driver" 1menuconfig SND_AOA
2 depends on SND!=n && PPC_PMAC
3
4config SND_AOA
5 tristate "Apple Onboard Audio driver" 2 tristate "Apple Onboard Audio driver"
6 depends on SND 3 depends on PPC_PMAC
7 select SND_PCM 4 select SND_PCM
8 ---help--- 5 ---help---
9 This option enables the new driver for the various 6 This option enables the new driver for the various
10 Apple Onboard Audio components. 7 Apple Onboard Audio components.
11 8
9if SND_AOA
10
12source "sound/aoa/fabrics/Kconfig" 11source "sound/aoa/fabrics/Kconfig"
13 12
14source "sound/aoa/codecs/Kconfig" 13source "sound/aoa/codecs/Kconfig"
15 14
16source "sound/aoa/soundbus/Kconfig" 15source "sound/aoa/soundbus/Kconfig"
17 16
18endmenu 17endif # SND_AOA
diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig
index d5fbd6016e93..808eb11ebacd 100644
--- a/sound/aoa/codecs/Kconfig
+++ b/sound/aoa/codecs/Kconfig
@@ -1,6 +1,5 @@
1config SND_AOA_ONYX 1config SND_AOA_ONYX
2 tristate "support Onyx chip" 2 tristate "support Onyx chip"
3 depends on SND_AOA
4 select I2C 3 select I2C
5 select I2C_POWERMAC 4 select I2C_POWERMAC
6 ---help--- 5 ---help---
@@ -10,7 +9,6 @@ config SND_AOA_ONYX
10 9
11#config SND_AOA_TOPAZ 10#config SND_AOA_TOPAZ
12# tristate "support Topaz chips" 11# tristate "support Topaz chips"
13# depends on SND_AOA
14# ---help--- 12# ---help---
15# This option enables support for the Topaz (CS84xx) 13# This option enables support for the Topaz (CS84xx)
16# codec chips found in the latest Apple machines, 14# codec chips found in the latest Apple machines,
@@ -19,7 +17,6 @@ config SND_AOA_ONYX
19 17
20config SND_AOA_TAS 18config SND_AOA_TAS
21 tristate "support TAS chips" 19 tristate "support TAS chips"
22 depends on SND_AOA
23 select I2C 20 select I2C
24 select I2C_POWERMAC 21 select I2C_POWERMAC
25 ---help--- 22 ---help---
@@ -29,7 +26,6 @@ config SND_AOA_TAS
29 26
30config SND_AOA_TOONIE 27config SND_AOA_TOONIE
31 tristate "support Toonie chip" 28 tristate "support Toonie chip"
32 depends on SND_AOA
33 ---help--- 29 ---help---
34 This option enables support for the toonie codec 30 This option enables support for the toonie codec
35 found in the Mac Mini. If you have a Mac Mini and 31 found in the Mac Mini. If you have a Mac Mini and
diff --git a/sound/aoa/fabrics/Kconfig b/sound/aoa/fabrics/Kconfig
index 50d7021ff677..3ca475a886b1 100644
--- a/sound/aoa/fabrics/Kconfig
+++ b/sound/aoa/fabrics/Kconfig
@@ -1,6 +1,5 @@
1config SND_AOA_FABRIC_LAYOUT 1config SND_AOA_FABRIC_LAYOUT
2 tristate "layout-id fabric" 2 tristate "layout-id fabric"
3 depends on SND_AOA
4 select SND_AOA_SOUNDBUS 3 select SND_AOA_SOUNDBUS
5 select SND_AOA_SOUNDBUS_I2S 4 select SND_AOA_SOUNDBUS_I2S
6 ---help--- 5 ---help---
diff --git a/sound/aoa/soundbus/Kconfig b/sound/aoa/soundbus/Kconfig
index 7368b7ddfe0d..839d1137b9b2 100644
--- a/sound/aoa/soundbus/Kconfig
+++ b/sound/aoa/soundbus/Kconfig
@@ -1,6 +1,5 @@
1config SND_AOA_SOUNDBUS 1config SND_AOA_SOUNDBUS
2 tristate "Apple Soundbus support" 2 tristate "Apple Soundbus support"
3 depends on SOUND
4 select SND_PCM 3 select SND_PCM
5 ---help--- 4 ---help---
6 This option enables the generic driver for the soundbus 5 This option enables the generic driver for the soundbus
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 2e4a5e0d16db..351e19ea3785 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -1,11 +1,19 @@
1# ALSA ARM drivers 1# ALSA ARM drivers
2 2
3menu "ALSA ARM devices" 3menuconfig SND_ARM
4 depends on SND!=n && ARM 4 bool "ARM sound devices"
5 depends on ARM
6 default y
7 help
8 Support for sound devices specific to ARM architectures.
9 Drivers that are implemented on ASoC can be found in
10 "ALSA for SoC audio support" section.
11
12if SND_ARM
5 13
6config SND_SA11XX_UDA1341 14config SND_SA11XX_UDA1341
7 tristate "SA11xx UDA1341TS driver (iPaq H3600)" 15 tristate "SA11xx UDA1341TS driver (iPaq H3600)"
8 depends on ARCH_SA1100 && SND && L3 16 depends on ARCH_SA1100 && L3
9 select SND_PCM 17 select SND_PCM
10 help 18 help
11 Say Y here if you have a Compaq iPaq H3x00 handheld computer 19 Say Y here if you have a Compaq iPaq H3x00 handheld computer
@@ -16,7 +24,7 @@ config SND_SA11XX_UDA1341
16 24
17config SND_ARMAACI 25config SND_ARMAACI
18 tristate "ARM PrimeCell PL041 AC Link support" 26 tristate "ARM PrimeCell PL041 AC Link support"
19 depends on SND && ARM_AMBA 27 depends on ARM_AMBA
20 select SND_PCM 28 select SND_PCM
21 select SND_AC97_CODEC 29 select SND_AC97_CODEC
22 30
@@ -26,11 +34,12 @@ config SND_PXA2XX_PCM
26 34
27config SND_PXA2XX_AC97 35config SND_PXA2XX_AC97
28 tristate "AC97 driver for the Intel PXA2xx chip" 36 tristate "AC97 driver for the Intel PXA2xx chip"
29 depends on ARCH_PXA && SND 37 depends on ARCH_PXA
30 select SND_PXA2XX_PCM 38 select SND_PXA2XX_PCM
31 select SND_AC97_CODEC 39 select SND_AC97_CODEC
32 help 40 help
33 Say Y or M if you want to support any AC97 codec attached to 41 Say Y or M if you want to support any AC97 codec attached to
34 the PXA2xx AC97 interface. 42 the PXA2xx AC97 interface.
35 43
36endmenu 44endif # SND_ARM
45
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index a8d71c6c8e75..db2111375784 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -1,24 +1,19 @@
1# ALSA soundcard-configuration 1# ALSA soundcard-configuration
2config SND_TIMER 2config SND_TIMER
3 tristate 3 tristate
4 depends on SND
5 4
6config SND_PCM 5config SND_PCM
7 tristate 6 tristate
8 select SND_TIMER 7 select SND_TIMER
9 depends on SND
10 8
11config SND_HWDEP 9config SND_HWDEP
12 tristate 10 tristate
13 depends on SND
14 11
15config SND_RAWMIDI 12config SND_RAWMIDI
16 tristate 13 tristate
17 depends on SND
18 14
19config SND_SEQUENCER 15config SND_SEQUENCER
20 tristate "Sequencer support" 16 tristate "Sequencer support"
21 depends on SND
22 select SND_TIMER 17 select SND_TIMER
23 help 18 help
24 Say Y or M to enable MIDI sequencer and router support. This 19 Say Y or M to enable MIDI sequencer and router support. This
@@ -44,11 +39,9 @@ config SND_SEQ_DUMMY
44 39
45config SND_OSSEMUL 40config SND_OSSEMUL
46 bool 41 bool
47 depends on SND
48 42
49config SND_MIXER_OSS 43config SND_MIXER_OSS
50 tristate "OSS Mixer API" 44 tristate "OSS Mixer API"
51 depends on SND
52 select SND_OSSEMUL 45 select SND_OSSEMUL
53 help 46 help
54 To enable OSS mixer API emulation (/dev/mixer*), say Y here 47 To enable OSS mixer API emulation (/dev/mixer*), say Y here
@@ -61,7 +54,6 @@ config SND_MIXER_OSS
61 54
62config SND_PCM_OSS 55config SND_PCM_OSS
63 tristate "OSS PCM (digital audio) API" 56 tristate "OSS PCM (digital audio) API"
64 depends on SND
65 select SND_OSSEMUL 57 select SND_OSSEMUL
66 select SND_PCM 58 select SND_PCM
67 help 59 help
@@ -84,7 +76,7 @@ config SND_PCM_OSS_PLUGINS
84 76
85config SND_SEQUENCER_OSS 77config SND_SEQUENCER_OSS
86 bool "OSS Sequencer API" 78 bool "OSS Sequencer API"
87 depends on SND && SND_SEQUENCER 79 depends on SND_SEQUENCER
88 select SND_OSSEMUL 80 select SND_OSSEMUL
89 help 81 help
90 Say Y here to enable OSS sequencer emulation (both 82 Say Y here to enable OSS sequencer emulation (both
@@ -98,7 +90,7 @@ config SND_SEQUENCER_OSS
98 90
99config SND_RTCTIMER 91config SND_RTCTIMER
100 tristate "RTC Timer support" 92 tristate "RTC Timer support"
101 depends on SND && RTC 93 depends on RTC
102 select SND_TIMER 94 select SND_TIMER
103 help 95 help
104 Say Y here to enable RTC timer support for ALSA. ALSA uses 96 Say Y here to enable RTC timer support for ALSA. ALSA uses
@@ -123,7 +115,6 @@ config SND_SEQ_RTCTIMER_DEFAULT
123 115
124config SND_DYNAMIC_MINORS 116config SND_DYNAMIC_MINORS
125 bool "Dynamic device file minor numbers" 117 bool "Dynamic device file minor numbers"
126 depends on SND
127 help 118 help
128 If you say Y here, the minor numbers of ALSA device files in 119 If you say Y here, the minor numbers of ALSA device files in
129 /dev/snd/ are allocated dynamically. This allows you to have 120 /dev/snd/ are allocated dynamically. This allows you to have
@@ -134,7 +125,6 @@ config SND_DYNAMIC_MINORS
134 125
135config SND_SUPPORT_OLD_API 126config SND_SUPPORT_OLD_API
136 bool "Support old ALSA API" 127 bool "Support old ALSA API"
137 depends on SND
138 default y 128 default y
139 help 129 help
140 Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3 130 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 132
143config SND_VERBOSE_PROCFS 133config SND_VERBOSE_PROCFS
144 bool "Verbose procfs contents" 134 bool "Verbose procfs contents"
145 depends on SND && PROC_FS 135 depends on PROC_FS
146 default y 136 default y
147 help 137 help
148 Say Y here to include code for verbose procfs contents (provides 138 Say Y here to include code for verbose procfs contents (provides
@@ -151,7 +141,6 @@ config SND_VERBOSE_PROCFS
151 141
152config SND_VERBOSE_PRINTK 142config SND_VERBOSE_PRINTK
153 bool "Verbose printk" 143 bool "Verbose printk"
154 depends on SND
155 help 144 help
156 Say Y here to enable verbose log messages. These messages 145 Say Y here to enable verbose log messages. These messages
157 will help to identify source file and position containing 146 will help to identify source file and position containing
@@ -161,7 +150,6 @@ config SND_VERBOSE_PRINTK
161 150
162config SND_DEBUG 151config SND_DEBUG
163 bool "Debug" 152 bool "Debug"
164 depends on SND
165 help 153 help
166 Say Y here to enable ALSA debug code. 154 Say Y here to enable ALSA debug code.
167 155
@@ -184,4 +172,3 @@ config SND_PCM_XRUN_DEBUG
184 172
185config SND_VMASTER 173config SND_VMASTER
186 bool 174 bool
187 depends on SND
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 159137bf4c11..79b4d3f25665 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -1,15 +1,41 @@
1# ALSA generic drivers 1config SND_MPU401_UART
2 tristate
3 select SND_RAWMIDI
2 4
3menu "Generic devices" 5config SND_OPL3_LIB
4 depends on SND!=n 6 tristate
7 select SND_TIMER
8 select SND_HWDEP
5 9
10config SND_OPL4_LIB
11 tristate
12 select SND_TIMER
13 select SND_HWDEP
14
15config SND_VX_LIB
16 tristate
17 select SND_HWDEP
18 select SND_PCM
19
20config SND_AC97_CODEC
21 tristate
22 select SND_PCM
23 select AC97_BUS
24 select SND_VMASTER
25
26menuconfig SND_DRIVERS
27 bool "Generic sound devices"
28 default y
29 help
30 Support for generic sound devices.
31
32if SND_DRIVERS
6 33
7config SND_PCSP 34config SND_PCSP
8 tristate "PC-Speaker support (READ HELP!)" 35 tristate "PC-Speaker support (READ HELP!)"
9 depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS 36 depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
10 depends on INPUT 37 depends on INPUT
11 depends on EXPERIMENTAL 38 depends on EXPERIMENTAL
12 depends on SND
13 select SND_PCM 39 select SND_PCM
14 help 40 help
15 If you don't have a sound card in your computer, you can include a 41 If you don't have a sound card in your computer, you can include a
@@ -35,34 +61,8 @@ config SND_PCSP
35 Say M if you don't. 61 Say M if you don't.
36 Say Y only if you really know what you do. 62 Say Y only if you really know what you do.
37 63
38config SND_MPU401_UART
39 tristate
40 select SND_RAWMIDI
41
42config SND_OPL3_LIB
43 tristate
44 select SND_TIMER
45 select SND_HWDEP
46
47config SND_OPL4_LIB
48 tristate
49 select SND_TIMER
50 select SND_HWDEP
51
52config SND_VX_LIB
53 tristate
54 select SND_HWDEP
55 select SND_PCM
56
57config SND_AC97_CODEC
58 tristate
59 select SND_PCM
60 select AC97_BUS
61 select SND_VMASTER
62
63config SND_DUMMY 64config SND_DUMMY
64 tristate "Dummy (/dev/null) soundcard" 65 tristate "Dummy (/dev/null) soundcard"
65 depends on SND
66 select SND_PCM 66 select SND_PCM
67 help 67 help
68 Say Y here to include the dummy driver. This driver does 68 Say Y here to include the dummy driver. This driver does
@@ -91,7 +91,6 @@ config SND_VIRMIDI
91 91
92config SND_MTPAV 92config SND_MTPAV
93 tristate "MOTU MidiTimePiece AV multiport MIDI" 93 tristate "MOTU MidiTimePiece AV multiport MIDI"
94 depends on SND
95 select SND_RAWMIDI 94 select SND_RAWMIDI
96 help 95 help
97 To use a MOTU MidiTimePiece AV multiport MIDI adapter 96 To use a MOTU MidiTimePiece AV multiport MIDI adapter
@@ -103,7 +102,7 @@ config SND_MTPAV
103 102
104config SND_MTS64 103config SND_MTS64
105 tristate "ESI Miditerminal 4140 driver" 104 tristate "ESI Miditerminal 4140 driver"
106 depends on SND && PARPORT 105 depends on PARPORT
107 select SND_RAWMIDI 106 select SND_RAWMIDI
108 help 107 help
109 The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with 108 The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with
@@ -116,7 +115,6 @@ config SND_MTS64
116 115
117config SND_SERIAL_U16550 116config SND_SERIAL_U16550
118 tristate "UART16550 serial MIDI driver" 117 tristate "UART16550 serial MIDI driver"
119 depends on SND
120 select SND_RAWMIDI 118 select SND_RAWMIDI
121 help 119 help
122 To include support for MIDI serial port interfaces, say Y here 120 To include support for MIDI serial port interfaces, say Y here
@@ -132,7 +130,6 @@ config SND_SERIAL_U16550
132 130
133config SND_MPU401 131config SND_MPU401
134 tristate "Generic MPU-401 UART driver" 132 tristate "Generic MPU-401 UART driver"
135 depends on SND
136 select SND_MPU401_UART 133 select SND_MPU401_UART
137 help 134 help
138 Say Y here to include support for MIDI ports compatible with 135 Say Y here to include support for MIDI ports compatible with
@@ -143,7 +140,7 @@ config SND_MPU401
143 140
144config SND_PORTMAN2X4 141config SND_PORTMAN2X4
145 tristate "Portman 2x4 driver" 142 tristate "Portman 2x4 driver"
146 depends on SND && PARPORT 143 depends on PARPORT
147 select SND_RAWMIDI 144 select SND_RAWMIDI
148 help 145 help
149 Say Y here to include support for Midiman Portman 2x4 parallel 146 Say Y here to include support for Midiman Portman 2x4 parallel
@@ -154,7 +151,7 @@ config SND_PORTMAN2X4
154 151
155config SND_ML403_AC97CR 152config SND_ML403_AC97CR
156 tristate "Xilinx ML403 AC97 Controller Reference" 153 tristate "Xilinx ML403 AC97 Controller Reference"
157 depends on SND && XILINX_VIRTEX 154 depends on XILINX_VIRTEX
158 select SND_AC97_CODEC 155 select SND_AC97_CODEC
159 help 156 help
160 Say Y here to include support for the 157 Say Y here to include support for the
@@ -164,4 +161,4 @@ config SND_ML403_AC97CR
164 To compile this driver as a module, choose M here: the module 161 To compile this driver as a module, choose M here: the module
165 will be called snd-ml403_ac97cr. 162 will be called snd-ml403_ac97cr.
166 163
167endmenu 164endif # SND_DRIVERS
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 2639a6ab8f2e..4575ba865910 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -21,12 +21,17 @@ config SND_SB16_DSP
21 select SND_PCM 21 select SND_PCM
22 select SND_SB_COMMON 22 select SND_SB_COMMON
23 23
24menu "ISA devices" 24menuconfig SND_ISA
25 depends on SND!=n && ISA && ISA_DMA_API 25 bool "ISA sound devices"
26 depends on ISA && ISA_DMA_API
27 default y
28 help
29 Support for sound devices connected via the ISA bus.
30
31if SND_ISA
26 32
27config SND_ADLIB 33config SND_ADLIB
28 tristate "AdLib FM card" 34 tristate "AdLib FM card"
29 depends on SND
30 select SND_OPL3_LIB 35 select SND_OPL3_LIB
31 help 36 help
32 Say Y here to include support for AdLib FM cards. 37 Say Y here to include support for AdLib FM cards.
@@ -36,7 +41,7 @@ config SND_ADLIB
36 41
37config SND_AD1816A 42config SND_AD1816A
38 tristate "Analog Devices SoundPort AD1816A" 43 tristate "Analog Devices SoundPort AD1816A"
39 depends on SND && PNP && ISA 44 depends on PNP
40 select ISAPNP 45 select ISAPNP
41 select SND_OPL3_LIB 46 select SND_OPL3_LIB
42 select SND_MPU401_UART 47 select SND_MPU401_UART
@@ -50,7 +55,6 @@ config SND_AD1816A
50 55
51config SND_AD1848 56config SND_AD1848
52 tristate "Generic AD1848/CS4248 driver" 57 tristate "Generic AD1848/CS4248 driver"
53 depends on SND
54 select SND_AD1848_LIB 58 select SND_AD1848_LIB
55 help 59 help
56 Say Y here to include support for AD1848 (Analog Devices) or 60 Say Y here to include support for AD1848 (Analog Devices) or
@@ -64,7 +68,7 @@ config SND_AD1848
64 68
65config SND_ALS100 69config SND_ALS100
66 tristate "Avance Logic ALS100/ALS120" 70 tristate "Avance Logic ALS100/ALS120"
67 depends on SND && PNP && ISA 71 depends on PNP
68 select ISAPNP 72 select ISAPNP
69 select SND_OPL3_LIB 73 select SND_OPL3_LIB
70 select SND_MPU401_UART 74 select SND_MPU401_UART
@@ -78,7 +82,7 @@ config SND_ALS100
78 82
79config SND_AZT2320 83config SND_AZT2320
80 tristate "Aztech Systems AZT2320" 84 tristate "Aztech Systems AZT2320"
81 depends on SND && PNP && ISA 85 depends on PNP
82 select ISAPNP 86 select ISAPNP
83 select SND_OPL3_LIB 87 select SND_OPL3_LIB
84 select SND_MPU401_UART 88 select SND_MPU401_UART
@@ -92,7 +96,6 @@ config SND_AZT2320
92 96
93config SND_CMI8330 97config SND_CMI8330
94 tristate "C-Media CMI8330" 98 tristate "C-Media CMI8330"
95 depends on SND
96 select SND_AD1848_LIB 99 select SND_AD1848_LIB
97 select SND_SB16_DSP 100 select SND_SB16_DSP
98 help 101 help
@@ -104,7 +107,6 @@ config SND_CMI8330
104 107
105config SND_CS4231 108config SND_CS4231
106 tristate "Generic Cirrus Logic CS4231 driver" 109 tristate "Generic Cirrus Logic CS4231 driver"
107 depends on SND
108 select SND_MPU401_UART 110 select SND_MPU401_UART
109 select SND_CS4231_LIB 111 select SND_CS4231_LIB
110 help 112 help
@@ -116,7 +118,6 @@ config SND_CS4231
116 118
117config SND_CS4232 119config SND_CS4232
118 tristate "Generic Cirrus Logic CS4232 driver" 120 tristate "Generic Cirrus Logic CS4232 driver"
119 depends on SND
120 select SND_OPL3_LIB 121 select SND_OPL3_LIB
121 select SND_MPU401_UART 122 select SND_MPU401_UART
122 select SND_CS4231_LIB 123 select SND_CS4231_LIB
@@ -129,7 +130,6 @@ config SND_CS4232
129 130
130config SND_CS4236 131config SND_CS4236
131 tristate "Generic Cirrus Logic CS4236+ driver" 132 tristate "Generic Cirrus Logic CS4236+ driver"
132 depends on SND
133 select SND_OPL3_LIB 133 select SND_OPL3_LIB
134 select SND_MPU401_UART 134 select SND_MPU401_UART
135 select SND_CS4231_LIB 135 select SND_CS4231_LIB
@@ -142,7 +142,7 @@ config SND_CS4236
142 142
143config SND_DT019X 143config SND_DT019X
144 tristate "Diamond Technologies DT-019X, Avance Logic ALS-007" 144 tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
145 depends on SND && PNP && ISA 145 depends on PNP
146 select ISAPNP 146 select ISAPNP
147 select SND_OPL3_LIB 147 select SND_OPL3_LIB
148 select SND_MPU401_UART 148 select SND_MPU401_UART
@@ -156,7 +156,7 @@ config SND_DT019X
156 156
157config SND_ES968 157config SND_ES968
158 tristate "Generic ESS ES968 driver" 158 tristate "Generic ESS ES968 driver"
159 depends on SND && PNP && ISA 159 depends on PNP
160 select ISAPNP 160 select ISAPNP
161 select SND_MPU401_UART 161 select SND_MPU401_UART
162 select SND_SB8_DSP 162 select SND_SB8_DSP
@@ -168,7 +168,6 @@ config SND_ES968
168 168
169config SND_ES1688 169config SND_ES1688
170 tristate "Generic ESS ES688/ES1688 driver" 170 tristate "Generic ESS ES688/ES1688 driver"
171 depends on SND
172 select SND_OPL3_LIB 171 select SND_OPL3_LIB
173 select SND_MPU401_UART 172 select SND_MPU401_UART
174 select SND_PCM 173 select SND_PCM
@@ -181,7 +180,6 @@ config SND_ES1688
181 180
182config SND_ES18XX 181config SND_ES18XX
183 tristate "Generic ESS ES18xx driver" 182 tristate "Generic ESS ES18xx driver"
184 depends on SND
185 select SND_OPL3_LIB 183 select SND_OPL3_LIB
186 select SND_MPU401_UART 184 select SND_MPU401_UART
187 select SND_PCM 185 select SND_PCM
@@ -193,7 +191,7 @@ config SND_ES18XX
193 191
194config SND_SC6000 192config SND_SC6000
195 tristate "Gallant SC-6000, Audio Excel DSP 16" 193 tristate "Gallant SC-6000, Audio Excel DSP 16"
196 depends on SND && HAS_IOPORT 194 depends on HAS_IOPORT
197 select SND_AD1848_LIB 195 select SND_AD1848_LIB
198 select SND_OPL3_LIB 196 select SND_OPL3_LIB
199 select SND_MPU401_UART 197 select SND_MPU401_UART
@@ -209,7 +207,6 @@ config SND_GUS_SYNTH
209 207
210config SND_GUSCLASSIC 208config SND_GUSCLASSIC
211 tristate "Gravis UltraSound Classic" 209 tristate "Gravis UltraSound Classic"
212 depends on SND
213 select SND_RAWMIDI 210 select SND_RAWMIDI
214 select SND_PCM 211 select SND_PCM
215 select SND_GUS_SYNTH 212 select SND_GUS_SYNTH
@@ -222,7 +219,6 @@ config SND_GUSCLASSIC
222 219
223config SND_GUSEXTREME 220config SND_GUSEXTREME
224 tristate "Gravis UltraSound Extreme" 221 tristate "Gravis UltraSound Extreme"
225 depends on SND
226 select SND_HWDEP 222 select SND_HWDEP
227 select SND_MPU401_UART 223 select SND_MPU401_UART
228 select SND_PCM 224 select SND_PCM
@@ -236,7 +232,6 @@ config SND_GUSEXTREME
236 232
237config SND_GUSMAX 233config SND_GUSMAX
238 tristate "Gravis UltraSound MAX" 234 tristate "Gravis UltraSound MAX"
239 depends on SND
240 select SND_RAWMIDI 235 select SND_RAWMIDI
241 select SND_CS4231_LIB 236 select SND_CS4231_LIB
242 select SND_GUS_SYNTH 237 select SND_GUS_SYNTH
@@ -249,7 +244,7 @@ config SND_GUSMAX
249 244
250config SND_INTERWAVE 245config SND_INTERWAVE
251 tristate "AMD InterWave, Gravis UltraSound PnP" 246 tristate "AMD InterWave, Gravis UltraSound PnP"
252 depends on SND && PNP && ISA 247 depends on PNP
253 select SND_RAWMIDI 248 select SND_RAWMIDI
254 select SND_CS4231_LIB 249 select SND_CS4231_LIB
255 select SND_GUS_SYNTH 250 select SND_GUS_SYNTH
@@ -263,7 +258,7 @@ config SND_INTERWAVE
263 258
264config SND_INTERWAVE_STB 259config SND_INTERWAVE_STB
265 tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)" 260 tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
266 depends on SND && PNP && ISA 261 depends on PNP
267 select SND_RAWMIDI 262 select SND_RAWMIDI
268 select SND_CS4231_LIB 263 select SND_CS4231_LIB
269 select SND_GUS_SYNTH 264 select SND_GUS_SYNTH
@@ -277,7 +272,6 @@ config SND_INTERWAVE_STB
277 272
278config SND_OPL3SA2 273config SND_OPL3SA2
279 tristate "Yamaha OPL3-SA2/SA3" 274 tristate "Yamaha OPL3-SA2/SA3"
280 depends on SND
281 select SND_OPL3_LIB 275 select SND_OPL3_LIB
282 select SND_MPU401_UART 276 select SND_MPU401_UART
283 select SND_CS4231_LIB 277 select SND_CS4231_LIB
@@ -290,7 +284,6 @@ config SND_OPL3SA2
290 284
291config SND_OPTI92X_AD1848 285config SND_OPTI92X_AD1848
292 tristate "OPTi 82C92x - AD1848" 286 tristate "OPTi 82C92x - AD1848"
293 depends on SND
294 select SND_OPL3_LIB 287 select SND_OPL3_LIB
295 select SND_OPL4_LIB 288 select SND_OPL4_LIB
296 select SND_MPU401_UART 289 select SND_MPU401_UART
@@ -304,7 +297,6 @@ config SND_OPTI92X_AD1848
304 297
305config SND_OPTI92X_CS4231 298config SND_OPTI92X_CS4231
306 tristate "OPTi 82C92x - CS4231" 299 tristate "OPTi 82C92x - CS4231"
307 depends on SND
308 select SND_OPL3_LIB 300 select SND_OPL3_LIB
309 select SND_OPL4_LIB 301 select SND_OPL4_LIB
310 select SND_MPU401_UART 302 select SND_MPU401_UART
@@ -318,7 +310,6 @@ config SND_OPTI92X_CS4231
318 310
319config SND_OPTI93X 311config SND_OPTI93X
320 tristate "OPTi 82C93x" 312 tristate "OPTi 82C93x"
321 depends on SND
322 select SND_OPL3_LIB 313 select SND_OPL3_LIB
323 select SND_MPU401_UART 314 select SND_MPU401_UART
324 select SND_PCM 315 select SND_PCM
@@ -331,7 +322,6 @@ config SND_OPTI93X
331 322
332config SND_MIRO 323config SND_MIRO
333 tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver" 324 tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"
334 depends on SND
335 select SND_OPL4_LIB 325 select SND_OPL4_LIB
336 select SND_CS4231_LIB 326 select SND_CS4231_LIB
337 select SND_MPU401_UART 327 select SND_MPU401_UART
@@ -345,7 +335,6 @@ config SND_MIRO
345 335
346config SND_SB8 336config SND_SB8
347 tristate "Sound Blaster 1.0/2.0/Pro (8-bit)" 337 tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
348 depends on SND
349 select SND_OPL3_LIB 338 select SND_OPL3_LIB
350 select SND_RAWMIDI 339 select SND_RAWMIDI
351 select SND_SB8_DSP 340 select SND_SB8_DSP
@@ -358,7 +347,6 @@ config SND_SB8
358 347
359config SND_SB16 348config SND_SB16
360 tristate "Sound Blaster 16 (PnP)" 349 tristate "Sound Blaster 16 (PnP)"
361 depends on SND
362 select SND_OPL3_LIB 350 select SND_OPL3_LIB
363 select SND_MPU401_UART 351 select SND_MPU401_UART
364 select SND_SB16_DSP 352 select SND_SB16_DSP
@@ -371,7 +359,6 @@ config SND_SB16
371 359
372config SND_SBAWE 360config SND_SBAWE
373 tristate "Sound Blaster AWE (32,64) (PnP)" 361 tristate "Sound Blaster AWE (32,64) (PnP)"
374 depends on SND
375 select SND_OPL3_LIB 362 select SND_OPL3_LIB
376 select SND_MPU401_UART 363 select SND_MPU401_UART
377 select SND_SB16_DSP 364 select SND_SB16_DSP
@@ -402,7 +389,6 @@ config SND_SB16_CSP_FIRMWARE_IN_KERNEL
402 389
403config SND_SGALAXY 390config SND_SGALAXY
404 tristate "Aztech Sound Galaxy" 391 tristate "Aztech Sound Galaxy"
405 depends on SND
406 select SND_AD1848_LIB 392 select SND_AD1848_LIB
407 help 393 help
408 Say Y here to include support for Aztech Sound Galaxy 394 Say Y here to include support for Aztech Sound Galaxy
@@ -413,7 +399,6 @@ config SND_SGALAXY
413 399
414config SND_SSCAPE 400config SND_SSCAPE
415 tristate "Ensoniq SoundScape PnP driver" 401 tristate "Ensoniq SoundScape PnP driver"
416 depends on SND
417 select SND_HWDEP 402 select SND_HWDEP
418 select SND_MPU401_UART 403 select SND_MPU401_UART
419 select SND_CS4231_LIB 404 select SND_CS4231_LIB
@@ -426,7 +411,6 @@ config SND_SSCAPE
426 411
427config SND_WAVEFRONT 412config SND_WAVEFRONT
428 tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" 413 tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
429 depends on SND
430 select FW_LOADER 414 select FW_LOADER
431 select SND_OPL3_LIB 415 select SND_OPL3_LIB
432 select SND_MPU401_UART 416 select SND_MPU401_UART
@@ -448,4 +432,5 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
448 you need to install the firmware files from the 432 you need to install the firmware files from the
449 alsa-firmware package. 433 alsa-firmware package.
450 434
451endmenu 435endif # SND_ISA
436
diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig
index 531f8ba96a71..bb26f6cf4c0a 100644
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@ -1,15 +1,21 @@
1# ALSA MIPS drivers 1# ALSA MIPS drivers
2 2
3menu "ALSA MIPS devices" 3menuconfig SND_MIPS
4 depends on SND!=n && MIPS 4 bool "MIPS sound devices"
5 depends on MIPS
6 default y
7 help
8 Support for sound devices of MIPS architectures.
9
10if SND_MIPS
5 11
6config SND_AU1X00 12config SND_AU1X00
7 tristate "Au1x00 AC97 Port Driver" 13 tristate "Au1x00 AC97 Port Driver"
8 depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND 14 depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
9 select SND_PCM 15 select SND_PCM
10 select SND_AC97_CODEC 16 select SND_AC97_CODEC
11 help 17 help
12 ALSA Sound driver for the Au1x00's AC97 port. 18 ALSA Sound driver for the Au1x00's AC97 port.
13 19
14endmenu 20endif # SND_MIPS
15 21
diff --git a/sound/parisc/Kconfig b/sound/parisc/Kconfig
index a5a7f9d75d05..9b61d95010f0 100644
--- a/sound/parisc/Kconfig
+++ b/sound/parisc/Kconfig
@@ -1,15 +1,20 @@
1# ALSA PA-RISC drivers 1# ALSA PA-RISC drivers
2 2
3menu "GSC devices" 3menuconfig SND_GSC
4 depends on SND!=n && GSC 4 bool "GSC sound devices"
5 depends on GSC
6 default y
7 help
8 Support for GSC sound devices on PA-RISC architectures.
9
10if SND_GSC
5 11
6config SND_HARMONY 12config SND_HARMONY
7 tristate "Harmony/Vivace sound chip" 13 tristate "Harmony/Vivace sound chip"
8 depends on SND
9 select SND_PCM 14 select SND_PCM
10 help 15 help
11 Say 'Y' or 'M' to include support for the Harmony/Vivace sound 16 Say 'Y' or 'M' to include support for the Harmony/Vivace sound
12 chip found in most GSC-based PA-RISC workstations. It's frequently 17 chip found in most GSC-based PA-RISC workstations. It's frequently
13 provided as part of the Lasi multi-function IC. 18 provided as part of the Lasi multi-function IC.
14 19
15endmenu 20endif # SND_GSC
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index d95fbb2b5b9f..b148c0b3ef3f 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -1,11 +1,16 @@
1# ALSA PCI drivers 1# ALSA PCI drivers
2 2
3menu "PCI devices" 3menuconfig SND_PCI
4 depends on SND!=n && PCI 4 bool "PCI sound devices"
5 depends on PCI
6 default y
7 help
8 Support for sound devices connected via the PCI bus.
9
10if SND_PCI
5 11
6config SND_AD1889 12config SND_AD1889
7 tristate "Analog Devices AD1889" 13 tristate "Analog Devices AD1889"
8 depends on SND
9 select SND_AC97_CODEC 14 select SND_AC97_CODEC
10 help 15 help
11 Say Y here to include support for the integrated AC97 sound 16 Say Y here to include support for the integrated AC97 sound
@@ -17,7 +22,6 @@ config SND_AD1889
17 22
18config SND_ALS300 23config SND_ALS300
19 tristate "Avance Logic ALS300/ALS300+" 24 tristate "Avance Logic ALS300/ALS300+"
20 depends on SND
21 select SND_PCM 25 select SND_PCM
22 select SND_AC97_CODEC 26 select SND_AC97_CODEC
23 select SND_OPL3_LIB 27 select SND_OPL3_LIB
@@ -29,7 +33,7 @@ config SND_ALS300
29 33
30config SND_ALS4000 34config SND_ALS4000
31 tristate "Avance Logic ALS4000" 35 tristate "Avance Logic ALS4000"
32 depends on SND && ISA_DMA_API 36 depends on ISA_DMA_API
33 select SND_OPL3_LIB 37 select SND_OPL3_LIB
34 select SND_MPU401_UART 38 select SND_MPU401_UART
35 select SND_PCM 39 select SND_PCM
@@ -43,7 +47,6 @@ config SND_ALS4000
43 47
44config SND_ALI5451 48config SND_ALI5451
45 tristate "ALi M5451 PCI Audio Controller" 49 tristate "ALi M5451 PCI Audio Controller"
46 depends on SND
47 select SND_MPU401_UART 50 select SND_MPU401_UART
48 select SND_AC97_CODEC 51 select SND_AC97_CODEC
49 help 52 help
@@ -57,7 +60,6 @@ config SND_ALI5451
57 60
58config SND_ATIIXP 61config SND_ATIIXP
59 tristate "ATI IXP AC97 Controller" 62 tristate "ATI IXP AC97 Controller"
60 depends on SND
61 select SND_AC97_CODEC 63 select SND_AC97_CODEC
62 help 64 help
63 Say Y here to include support for the integrated AC97 sound 65 Say Y here to include support for the integrated AC97 sound
@@ -69,7 +71,6 @@ config SND_ATIIXP
69 71
70config SND_ATIIXP_MODEM 72config SND_ATIIXP_MODEM
71 tristate "ATI IXP Modem" 73 tristate "ATI IXP Modem"
72 depends on SND
73 select SND_AC97_CODEC 74 select SND_AC97_CODEC
74 help 75 help
75 Say Y here to include support for the integrated MC97 modem on 76 Say Y here to include support for the integrated MC97 modem on
@@ -80,7 +81,6 @@ config SND_ATIIXP_MODEM
80 81
81config SND_AU8810 82config SND_AU8810
82 tristate "Aureal Advantage" 83 tristate "Aureal Advantage"
83 depends on SND
84 select SND_MPU401_UART 84 select SND_MPU401_UART
85 select SND_AC97_CODEC 85 select SND_AC97_CODEC
86 help 86 help
@@ -95,7 +95,6 @@ config SND_AU8810
95 95
96config SND_AU8820 96config SND_AU8820
97 tristate "Aureal Vortex" 97 tristate "Aureal Vortex"
98 depends on SND
99 select SND_MPU401_UART 98 select SND_MPU401_UART
100 select SND_AC97_CODEC 99 select SND_AC97_CODEC
101 help 100 help
@@ -109,7 +108,6 @@ config SND_AU8820
109 108
110config SND_AU8830 109config SND_AU8830
111 tristate "Aureal Vortex 2" 110 tristate "Aureal Vortex 2"
112 depends on SND
113 select SND_MPU401_UART 111 select SND_MPU401_UART
114 select SND_AC97_CODEC 112 select SND_AC97_CODEC
115 help 113 help
@@ -124,7 +122,6 @@ config SND_AU8830
124 122
125config SND_AW2 123config SND_AW2
126 tristate "Emagic Audiowerk 2" 124 tristate "Emagic Audiowerk 2"
127 depends on SND
128 help 125 help
129 Say Y here to include support for Emagic Audiowerk 2 soundcards. 126 Say Y here to include support for Emagic Audiowerk 2 soundcards.
130 127
@@ -139,7 +136,7 @@ config SND_AW2
139 136
140config SND_AZT3328 137config SND_AZT3328
141 tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)" 138 tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
142 depends on SND && EXPERIMENTAL 139 depends on EXPERIMENTAL
143 select SND_OPL3_LIB 140 select SND_OPL3_LIB
144 select SND_MPU401_UART 141 select SND_MPU401_UART
145 select SND_PCM 142 select SND_PCM
@@ -152,7 +149,6 @@ config SND_AZT3328
152 149
153config SND_BT87X 150config SND_BT87X
154 tristate "Bt87x Audio Capture" 151 tristate "Bt87x Audio Capture"
155 depends on SND
156 select SND_PCM 152 select SND_PCM
157 help 153 help
158 If you want to record audio from TV cards based on 154 If you want to record audio from TV cards based on
@@ -174,7 +170,6 @@ config SND_BT87X_OVERCLOCK
174 170
175config SND_CA0106 171config SND_CA0106
176 tristate "SB Audigy LS / Live 24bit" 172 tristate "SB Audigy LS / Live 24bit"
177 depends on SND
178 select SND_AC97_CODEC 173 select SND_AC97_CODEC
179 select SND_RAWMIDI 174 select SND_RAWMIDI
180 select SND_VMASTER 175 select SND_VMASTER
@@ -187,7 +182,6 @@ config SND_CA0106
187 182
188config SND_CMIPCI 183config SND_CMIPCI
189 tristate "C-Media 8338, 8738, 8768, 8770" 184 tristate "C-Media 8338, 8738, 8768, 8770"
190 depends on SND
191 select SND_OPL3_LIB 185 select SND_OPL3_LIB
192 select SND_MPU401_UART 186 select SND_MPU401_UART
193 select SND_PCM 187 select SND_PCM
@@ -201,13 +195,11 @@ config SND_CMIPCI
201 195
202config SND_OXYGEN_LIB 196config SND_OXYGEN_LIB
203 tristate 197 tristate
204 depends on SND
205 select SND_PCM 198 select SND_PCM
206 select SND_MPU401_UART 199 select SND_MPU401_UART
207 200
208config SND_OXYGEN 201config SND_OXYGEN
209 tristate "C-Media 8788 (Oxygen)" 202 tristate "C-Media 8788 (Oxygen)"
210 depends on SND
211 select SND_OXYGEN_LIB 203 select SND_OXYGEN_LIB
212 help 204 help
213 Say Y here to include support for sound cards based on the 205 Say Y here to include support for sound cards based on the
@@ -225,7 +217,6 @@ config SND_OXYGEN
225 217
226config SND_CS4281 218config SND_CS4281
227 tristate "Cirrus Logic (Sound Fusion) CS4281" 219 tristate "Cirrus Logic (Sound Fusion) CS4281"
228 depends on SND
229 select SND_OPL3_LIB 220 select SND_OPL3_LIB
230 select SND_RAWMIDI 221 select SND_RAWMIDI
231 select SND_AC97_CODEC 222 select SND_AC97_CODEC
@@ -237,7 +228,6 @@ config SND_CS4281
237 228
238config SND_CS46XX 229config SND_CS46XX
239 tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x" 230 tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
240 depends on SND
241 select SND_RAWMIDI 231 select SND_RAWMIDI
242 select SND_AC97_CODEC 232 select SND_AC97_CODEC
243 help 233 help
@@ -258,7 +248,7 @@ config SND_CS46XX_NEW_DSP
258 248
259config SND_CS5530 249config SND_CS5530
260 tristate "CS5530 Audio" 250 tristate "CS5530 Audio"
261 depends on SND && ISA_DMA_API 251 depends on ISA_DMA_API
262 select SND_SB16_DSP 252 select SND_SB16_DSP
263 help 253 help
264 Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips. 254 Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.
@@ -268,7 +258,7 @@ config SND_CS5530
268 258
269config SND_CS5535AUDIO 259config SND_CS5535AUDIO
270 tristate "CS5535/CS5536 Audio" 260 tristate "CS5535/CS5536 Audio"
271 depends on SND && X86 && !X86_64 261 depends on X86 && !X86_64
272 select SND_PCM 262 select SND_PCM
273 select SND_AC97_CODEC 263 select SND_AC97_CODEC
274 help 264 help
@@ -286,7 +276,6 @@ config SND_CS5535AUDIO
286 276
287config SND_DARLA20 277config SND_DARLA20
288 tristate "(Echoaudio) Darla20" 278 tristate "(Echoaudio) Darla20"
289 depends on SND
290 select FW_LOADER 279 select FW_LOADER
291 select SND_PCM 280 select SND_PCM
292 help 281 help
@@ -297,7 +286,6 @@ config SND_DARLA20
297 286
298config SND_GINA20 287config SND_GINA20
299 tristate "(Echoaudio) Gina20" 288 tristate "(Echoaudio) Gina20"
300 depends on SND
301 select FW_LOADER 289 select FW_LOADER
302 select SND_PCM 290 select SND_PCM
303 help 291 help
@@ -308,7 +296,6 @@ config SND_GINA20
308 296
309config SND_LAYLA20 297config SND_LAYLA20
310 tristate "(Echoaudio) Layla20" 298 tristate "(Echoaudio) Layla20"
311 depends on SND
312 select FW_LOADER 299 select FW_LOADER
313 select SND_RAWMIDI 300 select SND_RAWMIDI
314 select SND_PCM 301 select SND_PCM
@@ -320,7 +307,6 @@ config SND_LAYLA20
320 307
321config SND_DARLA24 308config SND_DARLA24
322 tristate "(Echoaudio) Darla24" 309 tristate "(Echoaudio) Darla24"
323 depends on SND
324 select FW_LOADER 310 select FW_LOADER
325 select SND_PCM 311 select SND_PCM
326 help 312 help
@@ -331,7 +317,6 @@ config SND_DARLA24
331 317
332config SND_GINA24 318config SND_GINA24
333 tristate "(Echoaudio) Gina24" 319 tristate "(Echoaudio) Gina24"
334 depends on SND
335 select FW_LOADER 320 select FW_LOADER
336 select SND_PCM 321 select SND_PCM
337 help 322 help
@@ -342,7 +327,6 @@ config SND_GINA24
342 327
343config SND_LAYLA24 328config SND_LAYLA24
344 tristate "(Echoaudio) Layla24" 329 tristate "(Echoaudio) Layla24"
345 depends on SND
346 select FW_LOADER 330 select FW_LOADER
347 select SND_RAWMIDI 331 select SND_RAWMIDI
348 select SND_PCM 332 select SND_PCM
@@ -354,7 +338,6 @@ config SND_LAYLA24
354 338
355config SND_MONA 339config SND_MONA
356 tristate "(Echoaudio) Mona" 340 tristate "(Echoaudio) Mona"
357 depends on SND
358 select FW_LOADER 341 select FW_LOADER
359 select SND_RAWMIDI 342 select SND_RAWMIDI
360 select SND_PCM 343 select SND_PCM
@@ -366,7 +349,6 @@ config SND_MONA
366 349
367config SND_MIA 350config SND_MIA
368 tristate "(Echoaudio) Mia" 351 tristate "(Echoaudio) Mia"
369 depends on SND
370 select FW_LOADER 352 select FW_LOADER
371 select SND_RAWMIDI 353 select SND_RAWMIDI
372 select SND_PCM 354 select SND_PCM
@@ -378,7 +360,6 @@ config SND_MIA
378 360
379config SND_ECHO3G 361config SND_ECHO3G
380 tristate "(Echoaudio) 3G cards" 362 tristate "(Echoaudio) 3G cards"
381 depends on SND
382 select FW_LOADER 363 select FW_LOADER
383 select SND_RAWMIDI 364 select SND_RAWMIDI
384 select SND_PCM 365 select SND_PCM
@@ -390,7 +371,6 @@ config SND_ECHO3G
390 371
391config SND_INDIGO 372config SND_INDIGO
392 tristate "(Echoaudio) Indigo" 373 tristate "(Echoaudio) Indigo"
393 depends on SND
394 select FW_LOADER 374 select FW_LOADER
395 select SND_PCM 375 select SND_PCM
396 help 376 help
@@ -401,7 +381,6 @@ config SND_INDIGO
401 381
402config SND_INDIGOIO 382config SND_INDIGOIO
403 tristate "(Echoaudio) Indigo IO" 383 tristate "(Echoaudio) Indigo IO"
404 depends on SND
405 select FW_LOADER 384 select FW_LOADER
406 select SND_PCM 385 select SND_PCM
407 help 386 help
@@ -412,7 +391,6 @@ config SND_INDIGOIO
412 391
413config SND_INDIGODJ 392config SND_INDIGODJ
414 tristate "(Echoaudio) Indigo DJ" 393 tristate "(Echoaudio) Indigo DJ"
415 depends on SND
416 select FW_LOADER 394 select FW_LOADER
417 select SND_PCM 395 select SND_PCM
418 help 396 help
@@ -423,7 +401,6 @@ config SND_INDIGODJ
423 401
424config SND_EMU10K1 402config SND_EMU10K1
425 tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)" 403 tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)"
426 depends on SND
427 select FW_LOADER 404 select FW_LOADER
428 select SND_HWDEP 405 select SND_HWDEP
429 select SND_RAWMIDI 406 select SND_RAWMIDI
@@ -441,7 +418,6 @@ config SND_EMU10K1
441 418
442config SND_EMU10K1X 419config SND_EMU10K1X
443 tristate "Emu10k1X (Dell OEM Version)" 420 tristate "Emu10k1X (Dell OEM Version)"
444 depends on SND
445 select SND_AC97_CODEC 421 select SND_AC97_CODEC
446 select SND_RAWMIDI 422 select SND_RAWMIDI
447 help 423 help
@@ -453,7 +429,6 @@ config SND_EMU10K1X
453 429
454config SND_ENS1370 430config SND_ENS1370
455 tristate "(Creative) Ensoniq AudioPCI 1370" 431 tristate "(Creative) Ensoniq AudioPCI 1370"
456 depends on SND
457 select SND_RAWMIDI 432 select SND_RAWMIDI
458 select SND_PCM 433 select SND_PCM
459 help 434 help
@@ -464,7 +439,6 @@ config SND_ENS1370
464 439
465config SND_ENS1371 440config SND_ENS1371
466 tristate "(Creative) Ensoniq AudioPCI 1371/1373" 441 tristate "(Creative) Ensoniq AudioPCI 1371/1373"
467 depends on SND
468 select SND_RAWMIDI 442 select SND_RAWMIDI
469 select SND_AC97_CODEC 443 select SND_AC97_CODEC
470 help 444 help
@@ -476,7 +450,6 @@ config SND_ENS1371
476 450
477config SND_ES1938 451config SND_ES1938
478 tristate "ESS ES1938/1946/1969 (Solo-1)" 452 tristate "ESS ES1938/1946/1969 (Solo-1)"
479 depends on SND
480 select SND_OPL3_LIB 453 select SND_OPL3_LIB
481 select SND_MPU401_UART 454 select SND_MPU401_UART
482 select SND_AC97_CODEC 455 select SND_AC97_CODEC
@@ -489,7 +462,6 @@ config SND_ES1938
489 462
490config SND_ES1968 463config SND_ES1968
491 tristate "ESS ES1968/1978 (Maestro-1/2/2E)" 464 tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
492 depends on SND
493 select SND_MPU401_UART 465 select SND_MPU401_UART
494 select SND_AC97_CODEC 466 select SND_AC97_CODEC
495 help 467 help
@@ -501,7 +473,6 @@ config SND_ES1968
501 473
502config SND_FM801 474config SND_FM801
503 tristate "ForteMedia FM801" 475 tristate "ForteMedia FM801"
504 depends on SND
505 select SND_OPL3_LIB 476 select SND_OPL3_LIB
506 select SND_MPU401_UART 477 select SND_MPU401_UART
507 select SND_AC97_CODEC 478 select SND_AC97_CODEC
@@ -528,7 +499,6 @@ config SND_FM801_TEA575X
528 499
529config SND_HDA_INTEL 500config SND_HDA_INTEL
530 tristate "Intel HD Audio" 501 tristate "Intel HD Audio"
531 depends on SND
532 select SND_PCM 502 select SND_PCM
533 select SND_VMASTER 503 select SND_VMASTER
534 help 504 help
@@ -637,7 +607,6 @@ config SND_HDA_POWER_SAVE_DEFAULT
637 607
638config SND_HDSP 608config SND_HDSP
639 tristate "RME Hammerfall DSP Audio" 609 tristate "RME Hammerfall DSP Audio"
640 depends on SND
641 select SND_HWDEP 610 select SND_HWDEP
642 select SND_RAWMIDI 611 select SND_RAWMIDI
643 select SND_PCM 612 select SND_PCM
@@ -650,7 +619,6 @@ config SND_HDSP
650 619
651config SND_HDSPM 620config SND_HDSPM
652 tristate "RME Hammerfall DSP MADI" 621 tristate "RME Hammerfall DSP MADI"
653 depends on SND
654 select SND_HWDEP 622 select SND_HWDEP
655 select SND_RAWMIDI 623 select SND_RAWMIDI
656 select SND_PCM 624 select SND_PCM
@@ -663,7 +631,6 @@ config SND_HDSPM
663 631
664config SND_HIFIER 632config SND_HIFIER
665 tristate "TempoTec HiFier Fantasia" 633 tristate "TempoTec HiFier Fantasia"
666 depends on SND
667 select SND_OXYGEN_LIB 634 select SND_OXYGEN_LIB
668 help 635 help
669 Say Y here to include support for the MediaTek/TempoTec HiFier 636 Say Y here to include support for the MediaTek/TempoTec HiFier
@@ -674,7 +641,6 @@ config SND_HIFIER
674 641
675config SND_ICE1712 642config SND_ICE1712
676 tristate "ICEnsemble ICE1712 (Envy24)" 643 tristate "ICEnsemble ICE1712 (Envy24)"
677 depends on SND
678 select SND_MPU401_UART 644 select SND_MPU401_UART
679 select SND_AC97_CODEC 645 select SND_AC97_CODEC
680 help 646 help
@@ -691,7 +657,6 @@ config SND_ICE1712
691 657
692config SND_ICE1724 658config SND_ICE1724
693 tristate "ICE/VT1724/1720 (Envy24HT/PT)" 659 tristate "ICE/VT1724/1720 (Envy24HT/PT)"
694 depends on SND
695 select SND_RAWMIDI 660 select SND_RAWMIDI
696 select SND_AC97_CODEC 661 select SND_AC97_CODEC
697 select SND_VMASTER 662 select SND_VMASTER
@@ -709,7 +674,6 @@ config SND_ICE1724
709 674
710config SND_INTEL8X0 675config SND_INTEL8X0
711 tristate "Intel/SiS/nVidia/AMD/ALi AC97 Controller" 676 tristate "Intel/SiS/nVidia/AMD/ALi AC97 Controller"
712 depends on SND
713 select SND_AC97_CODEC 677 select SND_AC97_CODEC
714 help 678 help
715 Say Y here to include support for the integrated AC97 sound 679 Say Y here to include support for the integrated AC97 sound
@@ -722,7 +686,6 @@ config SND_INTEL8X0
722 686
723config SND_INTEL8X0M 687config SND_INTEL8X0M
724 tristate "Intel/SiS/nVidia/AMD MC97 Modem" 688 tristate "Intel/SiS/nVidia/AMD MC97 Modem"
725 depends on SND
726 select SND_AC97_CODEC 689 select SND_AC97_CODEC
727 help 690 help
728 Say Y here to include support for the integrated MC97 modem on 691 Say Y here to include support for the integrated MC97 modem on
@@ -733,7 +696,6 @@ config SND_INTEL8X0M
733 696
734config SND_KORG1212 697config SND_KORG1212
735 tristate "Korg 1212 IO" 698 tristate "Korg 1212 IO"
736 depends on SND
737 select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL 699 select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
738 select SND_PCM 700 select SND_PCM
739 help 701 help
@@ -753,7 +715,6 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL
753 715
754config SND_MAESTRO3 716config SND_MAESTRO3
755 tristate "ESS Allegro/Maestro3" 717 tristate "ESS Allegro/Maestro3"
756 depends on SND
757 select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL 718 select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
758 select SND_AC97_CODEC 719 select SND_AC97_CODEC
759 help 720 help
@@ -774,7 +735,6 @@ config SND_MAESTRO3_FIRMWARE_IN_KERNEL
774 735
775config SND_MIXART 736config SND_MIXART
776 tristate "Digigram miXart" 737 tristate "Digigram miXart"
777 depends on SND
778 select SND_HWDEP 738 select SND_HWDEP
779 select SND_PCM 739 select SND_PCM
780 help 740 help
@@ -786,7 +746,6 @@ config SND_MIXART
786 746
787config SND_NM256 747config SND_NM256
788 tristate "NeoMagic NM256AV/ZX" 748 tristate "NeoMagic NM256AV/ZX"
789 depends on SND
790 select SND_AC97_CODEC 749 select SND_AC97_CODEC
791 help 750 help
792 Say Y here to include support for NeoMagic NM256AV/ZX chips. 751 Say Y here to include support for NeoMagic NM256AV/ZX chips.
@@ -796,7 +755,6 @@ config SND_NM256
796 755
797config SND_PCXHR 756config SND_PCXHR
798 tristate "Digigram PCXHR" 757 tristate "Digigram PCXHR"
799 depends on SND
800 select SND_PCM 758 select SND_PCM
801 select SND_HWDEP 759 select SND_HWDEP
802 help 760 help
@@ -807,7 +765,6 @@ config SND_PCXHR
807 765
808config SND_RIPTIDE 766config SND_RIPTIDE
809 tristate "Conexant Riptide" 767 tristate "Conexant Riptide"
810 depends on SND
811 select FW_LOADER 768 select FW_LOADER
812 select SND_OPL3_LIB 769 select SND_OPL3_LIB
813 select SND_MPU401_UART 770 select SND_MPU401_UART
@@ -820,7 +777,6 @@ config SND_RIPTIDE
820 777
821config SND_RME32 778config SND_RME32
822 tristate "RME Digi32, 32/8, 32 PRO" 779 tristate "RME Digi32, 32/8, 32 PRO"
823 depends on SND
824 select SND_PCM 780 select SND_PCM
825 help 781 help
826 Say Y to include support for RME Digi32, Digi32 PRO and 782 Say Y to include support for RME Digi32, Digi32 PRO and
@@ -832,7 +788,6 @@ config SND_RME32
832 788
833config SND_RME96 789config SND_RME96
834 tristate "RME Digi96, 96/8, 96/8 PRO" 790 tristate "RME Digi96, 96/8, 96/8 PRO"
835 depends on SND
836 select SND_PCM 791 select SND_PCM
837 help 792 help
838 Say Y here to include support for RME Digi96, Digi96/8 and 793 Say Y here to include support for RME Digi96, Digi96/8 and
@@ -843,7 +798,6 @@ config SND_RME96
843 798
844config SND_RME9652 799config SND_RME9652
845 tristate "RME Digi9652 (Hammerfall)" 800 tristate "RME Digi9652 (Hammerfall)"
846 depends on SND
847 select SND_PCM 801 select SND_PCM
848 help 802 help
849 Say Y here to include support for RME Hammerfall (RME 803 Say Y here to include support for RME Hammerfall (RME
@@ -854,7 +808,7 @@ config SND_RME9652
854 808
855config SND_SIS7019 809config SND_SIS7019
856 tristate "SiS 7019 Audio Accelerator" 810 tristate "SiS 7019 Audio Accelerator"
857 depends on SND && X86 && !X86_64 811 depends on X86 && !X86_64
858 select SND_AC97_CODEC 812 select SND_AC97_CODEC
859 help 813 help
860 Say Y here to include support for the SiS 7019 Audio Accelerator. 814 Say Y here to include support for the SiS 7019 Audio Accelerator.
@@ -864,7 +818,6 @@ config SND_SIS7019
864 818
865config SND_SONICVIBES 819config SND_SONICVIBES
866 tristate "S3 SonicVibes" 820 tristate "S3 SonicVibes"
867 depends on SND
868 select SND_OPL3_LIB 821 select SND_OPL3_LIB
869 select SND_MPU401_UART 822 select SND_MPU401_UART
870 select SND_AC97_CODEC 823 select SND_AC97_CODEC
@@ -877,7 +830,6 @@ config SND_SONICVIBES
877 830
878config SND_TRIDENT 831config SND_TRIDENT
879 tristate "Trident 4D-Wave DX/NX; SiS 7018" 832 tristate "Trident 4D-Wave DX/NX; SiS 7018"
880 depends on SND
881 select SND_MPU401_UART 833 select SND_MPU401_UART
882 select SND_AC97_CODEC 834 select SND_AC97_CODEC
883 help 835 help
@@ -889,7 +841,6 @@ config SND_TRIDENT
889 841
890config SND_VIA82XX 842config SND_VIA82XX
891 tristate "VIA 82C686A/B, 8233/8235 AC97 Controller" 843 tristate "VIA 82C686A/B, 8233/8235 AC97 Controller"
892 depends on SND
893 select SND_MPU401_UART 844 select SND_MPU401_UART
894 select SND_AC97_CODEC 845 select SND_AC97_CODEC
895 help 846 help
@@ -901,7 +852,6 @@ config SND_VIA82XX
901 852
902config SND_VIA82XX_MODEM 853config SND_VIA82XX_MODEM
903 tristate "VIA 82C686A/B, 8233 based Modems" 854 tristate "VIA 82C686A/B, 8233 based Modems"
904 depends on SND
905 select SND_AC97_CODEC 855 select SND_AC97_CODEC
906 help 856 help
907 Say Y here to include support for the integrated MC97 modem on 857 Say Y here to include support for the integrated MC97 modem on
@@ -912,7 +862,6 @@ config SND_VIA82XX_MODEM
912 862
913config SND_VIRTUOSO 863config SND_VIRTUOSO
914 tristate "Asus Virtuoso 100/200 (Xonar)" 864 tristate "Asus Virtuoso 100/200 (Xonar)"
915 depends on SND
916 select SND_OXYGEN_LIB 865 select SND_OXYGEN_LIB
917 help 866 help
918 Say Y here to include support for sound cards based on the 867 Say Y here to include support for sound cards based on the
@@ -923,7 +872,6 @@ config SND_VIRTUOSO
923 872
924config SND_VX222 873config SND_VX222
925 tristate "Digigram VX222" 874 tristate "Digigram VX222"
926 depends on SND
927 select SND_VX_LIB 875 select SND_VX_LIB
928 help 876 help
929 Say Y here to include support for Digigram VX222 soundcards. 877 Say Y here to include support for Digigram VX222 soundcards.
@@ -933,7 +881,6 @@ config SND_VX222
933 881
934config SND_YMFPCI 882config SND_YMFPCI
935 tristate "Yamaha YMF724/740/744/754" 883 tristate "Yamaha YMF724/740/744/754"
936 depends on SND
937 select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL 884 select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
938 select SND_OPL3_LIB 885 select SND_OPL3_LIB
939 select SND_MPU401_UART 886 select SND_MPU401_UART
@@ -975,4 +922,4 @@ config SND_AC97_POWER_SAVE_DEFAULT
975 The default time-out value in seconds for AC97 automatic 922 The default time-out value in seconds for AC97 automatic
976 power-save mode. 0 means to disable the power-save mode. 923 power-save mode. 0 means to disable the power-save mode.
977 924
978endmenu 925endif # SND_PCI
diff --git a/sound/pcmcia/Kconfig b/sound/pcmcia/Kconfig
index c9fa1a2bc58b..7fbb190adf6d 100644
--- a/sound/pcmcia/Kconfig
+++ b/sound/pcmcia/Kconfig
@@ -1,11 +1,16 @@
1# ALSA PCMCIA drivers 1# ALSA PCMCIA drivers
2 2
3menu "PCMCIA devices" 3menuconfig SND_PCMCIA
4 depends on SND!=n && PCMCIA 4 bool "PCMCIA sound devices"
5 depends on PCMCIA
6 default y
7 help
8 Support for sound devices connected via the PCMCIA bus.
9
10if SND_PCMCIA && PCMCIA
5 11
6config SND_VXPOCKET 12config SND_VXPOCKET
7 tristate "Digigram VXpocket" 13 tristate "Digigram VXpocket"
8 depends on SND && PCMCIA
9 select SND_VX_LIB 14 select SND_VX_LIB
10 help 15 help
11 Say Y here to include support for Digigram VXpocket and 16 Say Y here to include support for Digigram VXpocket and
@@ -16,7 +21,6 @@ config SND_VXPOCKET
16 21
17config SND_PDAUDIOCF 22config SND_PDAUDIOCF
18 tristate "Sound Core PDAudioCF" 23 tristate "Sound Core PDAudioCF"
19 depends on SND && PCMCIA
20 select SND_PCM 24 select SND_PCM
21 help 25 help
22 Say Y here to include support for Sound Core PDAudioCF 26 Say Y here to include support for Sound Core PDAudioCF
@@ -25,4 +29,5 @@ config SND_PDAUDIOCF
25 To compile this driver as a module, choose M here: the module 29 To compile this driver as a module, choose M here: the module
26 will be called snd-pdaudiocf. 30 will be called snd-pdaudiocf.
27 31
28endmenu 32endif # SND_PCMCIA
33
diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig
index cacb0b136883..777de2b17178 100644
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
@@ -1,17 +1,17 @@
1# ALSA PowerMac drivers 1# ALSA PowerMac drivers
2 2
3menu "ALSA PowerMac devices" 3menuconfig SND_PPC
4 depends on SND!=n && PPC 4 bool "PowerPC sound devices"
5 5 depends on PPC64 || PPC32
6comment "ALSA PowerMac requires I2C" 6 default y
7 depends on SND && I2C=n 7 help
8 Support for sound devices specific to PowerPC architectures.
8 9
9comment "ALSA PowerMac requires INPUT" 10if SND_PPC
10 depends on SND && INPUT=n
11 11
12config SND_POWERMAC 12config SND_POWERMAC
13 tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" 13 tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
14 depends on SND && I2C && INPUT && PPC_PMAC 14 depends on I2C && INPUT && PPC_PMAC
15 select SND_PCM 15 select SND_PCM
16 help 16 help
17 Say Y here to include support for the integrated sound device. 17 Say Y here to include support for the integrated sound device.
@@ -32,14 +32,9 @@ config SND_POWERMAC_AUTO_DRC
32 Note that you can turn on/off DRC manually even without this 32 Note that you can turn on/off DRC manually even without this
33 option. 33 option.
34 34
35endmenu
36
37menu "ALSA PowerPC devices"
38 depends on SND!=n && ( PPC64 || PPC32 )
39
40config SND_PS3 35config SND_PS3
41 tristate "PS3 Audio support" 36 tristate "PS3 Audio support"
42 depends on SND && PS3_PS3AV 37 depends on PS3_PS3AV
43 select SND_PCM 38 select SND_PCM
44 default m 39 default m
45 help 40 help
@@ -52,4 +47,5 @@ config SND_PS3_DEFAULT_START_DELAY
52 int "Startup delay time in ms" 47 int "Startup delay time in ms"
53 depends on SND_PS3 48 depends on SND_PS3
54 default "2000" 49 default "2000"
55endmenu 50
51endif # SND_PPC
diff --git a/sound/sh/Kconfig b/sound/sh/Kconfig
index b7e08ef22a94..cfc143985802 100644
--- a/sound/sh/Kconfig
+++ b/sound/sh/Kconfig
@@ -1,14 +1,22 @@
1# ALSA SH drivers 1# ALSA SH drivers
2 2
3menu "SUPERH devices" 3menuconfig SND_SUPERH
4 depends on SND!=n && SUPERH 4 bool "SUPERH sound devices"
5 depends on SUPERH
6 default y
7 help
8 Support for sound devices specific to SUPERH architectures.
9 Drivers that are implemented on ASoC can be found in
10 "ALSA for SoC audio support" section.
11
12if SND_SUPERH
5 13
6config SND_AICA 14config SND_AICA
7 tristate "Dreamcast Yamaha AICA sound" 15 tristate "Dreamcast Yamaha AICA sound"
8 depends on SH_DREAMCAST && SND 16 depends on SH_DREAMCAST
9 select SND_PCM 17 select SND_PCM
10 help 18 help
11 ALSA Sound driver for the SEGA Dreamcast console. 19 ALSA Sound driver for the SEGA Dreamcast console.
12 20
13endmenu 21endif # SND_SUPERH
14 22
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 18f28ac4bfe8..fd7bc4f89072 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -2,15 +2,8 @@
2# SoC audio configuration 2# SoC audio configuration
3# 3#
4 4
5menu "System on Chip audio support" 5menuconfig SND_SOC
6 depends on SND!=n
7
8config SND_SOC_AC97_BUS
9 bool
10
11config SND_SOC
12 tristate "ALSA for SoC audio support" 6 tristate "ALSA for SoC audio support"
13 depends on SND
14 select SND_PCM 7 select SND_PCM
15 ---help--- 8 ---help---
16 9
@@ -23,6 +16,11 @@ config SND_SOC
23 This ASoC audio support can also be built as a module. If so, the module 16 This ASoC audio support can also be built as a module. If so, the module
24 will be called snd-soc-core. 17 will be called snd-soc-core.
25 18
19if SND_SOC
20
21config SND_SOC_AC97_BUS
22 bool
23
26# All the supported Soc's 24# All the supported Soc's
27source "sound/soc/at91/Kconfig" 25source "sound/soc/at91/Kconfig"
28source "sound/soc/pxa/Kconfig" 26source "sound/soc/pxa/Kconfig"
@@ -35,4 +33,5 @@ source "sound/soc/omap/Kconfig"
35# Supported codecs 33# Supported codecs
36source "sound/soc/codecs/Kconfig" 34source "sound/soc/codecs/Kconfig"
37 35
38endmenu 36endif # SND_SOC
37
diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig
index 5cb93fd3a407..905186502e00 100644
--- a/sound/soc/at91/Kconfig
+++ b/sound/soc/at91/Kconfig
@@ -1,6 +1,6 @@
1config SND_AT91_SOC 1config SND_AT91_SOC
2 tristate "SoC Audio for the Atmel AT91 System-on-Chip" 2 tristate "SoC Audio for the Atmel AT91 System-on-Chip"
3 depends on ARCH_AT91 && SND_SOC 3 depends on ARCH_AT91
4 help 4 help
5 Say Y or M if you want to add support for codecs attached to 5 Say Y or M if you want to add support for codecs attached to
6 the AT91 SSC interface. You will also need 6 the AT91 SSC interface. You will also need
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 3903ab7dfa4a..d4a5fe42f6e0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1,31 +1,25 @@
1config SND_SOC_AC97_CODEC 1config SND_SOC_AC97_CODEC
2 tristate 2 tristate
3 depends on SND_SOC 3 select SND_AC97_CODEC
4 4
5config SND_SOC_WM8731 5config SND_SOC_WM8731
6 tristate 6 tristate
7 depends on SND_SOC
8 7
9config SND_SOC_WM8750 8config SND_SOC_WM8750
10 tristate 9 tristate
11 depends on SND_SOC
12 10
13config SND_SOC_WM8753 11config SND_SOC_WM8753
14 tristate 12 tristate
15 depends on SND_SOC
16 13
17config SND_SOC_WM9712 14config SND_SOC_WM9712
18 tristate 15 tristate
19 depends on SND_SOC
20 16
21config SND_SOC_WM9713 17config SND_SOC_WM9713
22 tristate 18 tristate
23 depends on SND_SOC
24 19
25# Cirrus Logic CS4270 Codec 20# Cirrus Logic CS4270 Codec
26config SND_SOC_CS4270 21config SND_SOC_CS4270
27 tristate 22 tristate
28 depends on SND_SOC
29 23
30# Cirrus Logic CS4270 Codec Hardware Mute Support 24# Cirrus Logic CS4270 Codec Hardware Mute Support
31# Select if you have external muting circuitry attached to your CS4270. 25# Select if you have external muting circuitry attached to your CS4270.
@@ -43,4 +37,4 @@ config SND_SOC_CS4270_VD33_ERRATA
43 37
44config SND_SOC_TLV320AIC3X 38config SND_SOC_TLV320AIC3X
45 tristate 39 tristate
46 depends on SND_SOC && I2C 40 depends on I2C
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 20680c551aab..8f7e33834902 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -1,6 +1,6 @@
1config SND_DAVINCI_SOC 1config SND_DAVINCI_SOC
2 tristate "SoC Audio for the TI DAVINCI chip" 2 tristate "SoC Audio for the TI DAVINCI chip"
3 depends on ARCH_DAVINCI && SND_SOC 3 depends on ARCH_DAVINCI
4 help 4 help
5 Say Y or M if you want to add support for codecs attached to 5 Say Y or M if you want to add support for codecs attached to
6 the DAVINCI AC97 or I2S interface. You will also need 6 the DAVINCI AC97 or I2S interface. You will also need
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 257101f44e9e..19802e27df4b 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -2,7 +2,7 @@ menu "ALSA SoC audio for Freescale SOCs"
2 2
3config SND_SOC_MPC8610 3config SND_SOC_MPC8610
4 bool "ALSA SoC support for the MPC8610 SOC" 4 bool "ALSA SoC support for the MPC8610 SOC"
5 depends on SND_SOC && MPC8610_HPCD 5 depends on MPC8610_HPCD
6 default y if MPC8610 6 default y if MPC8610
7 help 7 help
8 Say Y if you want to add support for codecs attached to the SSI 8 Say Y if you want to add support for codecs attached to the SSI
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 484f883459e0..18a40dc8ad9d 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -1,6 +1,6 @@
1config SND_PXA2XX_SOC 1config SND_PXA2XX_SOC
2 tristate "SoC Audio for the Intel PXA2xx chip" 2 tristate "SoC Audio for the Intel PXA2xx chip"
3 depends on ARCH_PXA && SND_SOC 3 depends on ARCH_PXA
4 help 4 help
5 Say Y or M if you want to add support for codecs attached to 5 Say Y or M if you want to add support for codecs attached to
6 the PXA2xx AC97, I2S or SSP interface. You will also need 6 the PXA2xx AC97, I2S or SSP interface. You will also need
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index 1f6dbfc4caa8..b9f2353effeb 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -1,7 +1,6 @@
1config SND_S3C24XX_SOC 1config SND_S3C24XX_SOC
2 tristate "SoC Audio for the Samsung S3C24XX chips" 2 tristate "SoC Audio for the Samsung S3C24XX chips"
3 depends on ARCH_S3C2410 && SND_SOC 3 depends on ARCH_S3C2410
4 select SND_PCM
5 help 4 help
6 Say Y or M if you want to add support for codecs attached to 5 Say Y or M if you want to add support for codecs attached to
7 the S3C24XX AC97, I2S or SSP interface. You will also need 6 the S3C24XX AC97, I2S or SSP interface. You will also need
@@ -16,7 +15,6 @@ config SND_S3C2412_SOC_I2S
16config SND_S3C2443_SOC_AC97 15config SND_S3C2443_SOC_AC97
17 tristate 16 tristate
18 select AC97_BUS 17 select AC97_BUS
19 select SND_AC97_CODEC
20 select SND_SOC_AC97_BUS 18 select SND_SOC_AC97_BUS
21 19
22config SND_S3C24XX_SOC_NEO1973_WM8753 20config SND_S3C24XX_SOC_NEO1973_WM8753
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 4c1e013381c9..54bd604012af 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -3,7 +3,7 @@ menu "SoC Audio support for SuperH"
3 3
4config SND_SOC_PCM_SH7760 4config SND_SOC_PCM_SH7760
5 tristate "SoC Audio support for Renesas SH7760" 5 tristate "SoC Audio support for Renesas SH7760"
6 depends on CPU_SUBTYPE_SH7760 && SND_SOC && SH_DMABRG 6 depends on CPU_SUBTYPE_SH7760 && SH_DMABRG
7 help 7 help
8 Enable this option for SH7760 AC97/I2S audio support. 8 Enable this option for SH7760 AC97/I2S audio support.
9 9
@@ -13,10 +13,9 @@ config SND_SOC_PCM_SH7760
13## 13##
14 14
15config SND_SOC_SH4_HAC 15config SND_SOC_SH4_HAC
16 tristate
16 select AC97_BUS 17 select AC97_BUS
17 select SND_SOC_AC97_BUS 18 select SND_SOC_AC97_BUS
18 select SND_AC97_CODEC
19 tristate
20 19
21config SND_SOC_SH4_SSI 20config SND_SOC_SH4_SSI
22 tristate 21 tristate
diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index 079e22af074c..d75deba5617d 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -1,11 +1,17 @@
1# ALSA Sparc drivers 1# ALSA Sparc drivers
2 2
3menu "ALSA Sparc devices" 3menuconfig SND_SPARC
4 depends on SND!=n && SPARC 4 bool "Sparc sound devices"
5 depends on SPARC
6 default y
7 help
8 Support for sound devices specific to Sun SPARC architectures.
9
10if SND_SPARC
5 11
6config SND_SUN_AMD7930 12config SND_SUN_AMD7930
7 tristate "Sun AMD7930" 13 tristate "Sun AMD7930"
8 depends on SBUS && SND 14 depends on SBUS
9 select SND_PCM 15 select SND_PCM
10 help 16 help
11 Say Y here to include support for AMD7930 sound device on Sun. 17 Say Y here to include support for AMD7930 sound device on Sun.
@@ -15,7 +21,6 @@ config SND_SUN_AMD7930
15 21
16config SND_SUN_CS4231 22config SND_SUN_CS4231
17 tristate "Sun CS4231" 23 tristate "Sun CS4231"
18 depends on SND
19 select SND_PCM 24 select SND_PCM
20 help 25 help
21 Say Y here to include support for CS4231 sound device on Sun. 26 Say Y here to include support for CS4231 sound device on Sun.
@@ -25,7 +30,7 @@ config SND_SUN_CS4231
25 30
26config SND_SUN_DBRI 31config SND_SUN_DBRI
27 tristate "Sun DBRI" 32 tristate "Sun DBRI"
28 depends on SND && SBUS 33 depends on SBUS
29 select SND_PCM 34 select SND_PCM
30 help 35 help
31 Say Y here to include support for DBRI sound device on Sun. 36 Say Y here to include support for DBRI sound device on Sun.
@@ -33,4 +38,4 @@ config SND_SUN_DBRI
33 To compile this driver as a module, choose M here: the module 38 To compile this driver as a module, choose M here: the module
34 will be called snd-sun-dbri. 39 will be called snd-sun-dbri.
35 40
36endmenu 41endif # SND_SPARC
diff --git a/sound/spi/Kconfig b/sound/spi/Kconfig
index 0d08c29213c8..e6485be2e6f7 100644
--- a/sound/spi/Kconfig
+++ b/sound/spi/Kconfig
@@ -1,7 +1,13 @@
1#SPI drivers 1#SPI drivers
2 2
3menu "SPI devices" 3menuconfig SND_SPI
4 depends on SND != n 4 bool "SPI sound devices"
5 depends on SPI
6 default y
7 help
8 Support for sound devices connected via the SPI bus.
9
10if SND_SPI
5 11
6config SND_AT73C213 12config SND_AT73C213
7 tristate "Atmel AT73C213 DAC driver" 13 tristate "Atmel AT73C213 DAC driver"
@@ -28,4 +34,5 @@ config SND_AT73C213_TARGET_BITRATE
28 34
29 Set to 48000 Hz by default. 35 Set to 48000 Hz by default.
30 36
31endmenu 37endif # SND_SPI
38
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 9351b8a765b9..ffcdc8f4ef66 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -1,11 +1,16 @@
1# ALSA USB drivers 1# ALSA USB drivers
2 2
3menu "USB devices" 3menuconfig SND_USB
4 depends on SND!=n && USB!=n 4 bool "USB sound devices"
5 depends on USB
6 default y
7 help
8 Support for sound devices connected via the USB bus.
9
10if SND_USB && USB
5 11
6config SND_USB_AUDIO 12config SND_USB_AUDIO
7 tristate "USB Audio/MIDI driver" 13 tristate "USB Audio/MIDI driver"
8 depends on SND && USB
9 select SND_HWDEP 14 select SND_HWDEP
10 select SND_RAWMIDI 15 select SND_RAWMIDI
11 select SND_PCM 16 select SND_PCM
@@ -18,7 +23,7 @@ config SND_USB_AUDIO
18 23
19config SND_USB_USX2Y 24config SND_USB_USX2Y
20 tristate "Tascam US-122, US-224 and US-428 USB driver" 25 tristate "Tascam US-122, US-224 and US-428 USB driver"
21 depends on SND && USB && (X86 || PPC || ALPHA) 26 depends on X86 || PPC || ALPHA
22 select SND_HWDEP 27 select SND_HWDEP
23 select SND_RAWMIDI 28 select SND_RAWMIDI
24 select SND_PCM 29 select SND_PCM
@@ -31,7 +36,6 @@ config SND_USB_USX2Y
31 36
32config SND_USB_CAIAQ 37config SND_USB_CAIAQ
33 tristate "Native Instruments USB audio devices" 38 tristate "Native Instruments USB audio devices"
34 depends on SND && USB
35 select SND_HWDEP 39 select SND_HWDEP
36 select SND_RAWMIDI 40 select SND_RAWMIDI
37 select SND_PCM 41 select SND_PCM
@@ -63,5 +67,5 @@ config SND_USB_CAIAQ_INPUT
63 * Native Instruments Kore Controller 2 67 * Native Instruments Kore Controller 2
64 * Native Instruments Audio Kontrol 1 68 * Native Instruments Audio Kontrol 1
65 69
66endmenu 70endif # SND_USB
67 71
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 01:52:13 -0500