Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 89fe5117928b2c1272c9376362131ded561c91ad

Authored by Takashi Iwai
1 parent 06b5fb97ce
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

sound: Convert to menuconfig 

Convert menu in sound Kconfig files to menuconfig and if.

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

Showing 26 changed files with 203 additions and 265 deletions Side-by-side Diff

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