diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-08 08:10:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-08 12:55:03 -0400 |
commit | 6054b68e84478e66e626bde33f93b5f0bf48c180 (patch) | |
tree | f483ed2777058c7c5ae6cc447bdd19d5309b4ca0 /sound/pci/Kconfig | |
parent | 5bdd6cc3300be534f2a2cf826e3fb926b5695698 (diff) |
V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci
TVMixer and FM801 Tea5757 are still using V4L1 API.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r-- | sound/pci/Kconfig | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index d7ad32f514da..e49c0fe21b0d 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -16,16 +16,16 @@ config SND_AD1889 | |||
16 | will be called snd-ad1889. | 16 | will be called snd-ad1889. |
17 | 17 | ||
18 | config SND_ALS300 | 18 | config SND_ALS300 |
19 | tristate "Avance Logic ALS300/ALS300+" | 19 | tristate "Avance Logic ALS300/ALS300+" |
20 | depends on SND | 20 | depends on SND |
21 | select SND_PCM | 21 | select SND_PCM |
22 | select SND_AC97_CODEC | 22 | select SND_AC97_CODEC |
23 | select SND_OPL3_LIB | 23 | select SND_OPL3_LIB |
24 | help | 24 | help |
25 | Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+ | 25 | Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+ |
26 | 26 | ||
27 | To compile this driver as a module, choose M here: the module | 27 | To compile this driver as a module, choose M here: the module |
28 | will be called snd-als300 | 28 | will be called snd-als300 |
29 | 29 | ||
30 | config SND_ALS4000 | 30 | config SND_ALS4000 |
31 | tristate "Avance Logic ALS4000" | 31 | tristate "Avance Logic ALS4000" |
@@ -78,49 +78,49 @@ config SND_ATIIXP_MODEM | |||
78 | will be called snd-atiixp-modem. | 78 | will be called snd-atiixp-modem. |
79 | 79 | ||
80 | config SND_AU8810 | 80 | config SND_AU8810 |
81 | tristate "Aureal Advantage" | 81 | tristate "Aureal Advantage" |
82 | depends on SND | 82 | depends on SND |
83 | select SND_MPU401_UART | 83 | select SND_MPU401_UART |
84 | select SND_AC97_CODEC | 84 | select SND_AC97_CODEC |
85 | help | 85 | help |
86 | Say Y here to include support for Aureal Advantage soundcards. | 86 | Say Y here to include support for Aureal Advantage soundcards. |
87 | 87 | ||
88 | Supported features: Hardware Mixer, SRC, EQ and SPDIF output. | 88 | Supported features: Hardware Mixer, SRC, EQ and SPDIF output. |
89 | 3D support code is in place, but not yet useable. For more info, | 89 | 3D support code is in place, but not yet useable. For more info, |
90 | email the ALSA developer list, or <mjander@users.sourceforge.net>. | 90 | email the ALSA developer list, or <mjander@users.sourceforge.net>. |
91 | 91 | ||
92 | To compile this driver as a module, choose M here: the module | 92 | To compile this driver as a module, choose M here: the module |
93 | will be called snd-au8810. | 93 | will be called snd-au8810. |
94 | 94 | ||
95 | config SND_AU8820 | 95 | config SND_AU8820 |
96 | tristate "Aureal Vortex" | 96 | tristate "Aureal Vortex" |
97 | depends on SND | 97 | depends on SND |
98 | select SND_MPU401_UART | 98 | select SND_MPU401_UART |
99 | select SND_AC97_CODEC | 99 | select SND_AC97_CODEC |
100 | help | 100 | help |
101 | Say Y here to include support for Aureal Vortex soundcards. | 101 | Say Y here to include support for Aureal Vortex soundcards. |
102 | 102 | ||
103 | Supported features: Hardware Mixer and SRC. For more info, email | 103 | Supported features: Hardware Mixer and SRC. For more info, email |
104 | the ALSA developer list, or <mjander@users.sourceforge.net>. | 104 | the ALSA developer list, or <mjander@users.sourceforge.net>. |
105 | 105 | ||
106 | To compile this driver as a module, choose M here: the module | 106 | To compile this driver as a module, choose M here: the module |
107 | will be called snd-au8820. | 107 | will be called snd-au8820. |
108 | 108 | ||
109 | config SND_AU8830 | 109 | config SND_AU8830 |
110 | tristate "Aureal Vortex 2" | 110 | tristate "Aureal Vortex 2" |
111 | depends on SND | 111 | depends on SND |
112 | select SND_MPU401_UART | 112 | select SND_MPU401_UART |
113 | select SND_AC97_CODEC | 113 | select SND_AC97_CODEC |
114 | help | 114 | help |
115 | Say Y here to include support for Aureal Vortex 2 soundcards. | 115 | Say Y here to include support for Aureal Vortex 2 soundcards. |
116 | 116 | ||
117 | Supported features: Hardware Mixer, SRC, EQ and SPDIF output. | 117 | Supported features: Hardware Mixer, SRC, EQ and SPDIF output. |
118 | 3D support code is in place, but not yet useable. For more info, | 118 | 3D support code is in place, but not yet useable. For more info, |
119 | email the ALSA developer list, or <mjander@users.sourceforge.net>. | 119 | email the ALSA developer list, or <mjander@users.sourceforge.net>. |
120 | 120 | ||
121 | To compile this driver as a module, choose M here: the module | 121 | To compile this driver as a module, choose M here: the module |
122 | will be called snd-au8830. | 122 | will be called snd-au8830. |
123 | 123 | ||
124 | config SND_AZT3328 | 124 | config SND_AZT3328 |
125 | tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)" | 125 | tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)" |
126 | depends on SND && EXPERIMENTAL | 126 | depends on SND && EXPERIMENTAL |
@@ -135,10 +135,10 @@ config SND_AZT3328 | |||
135 | will be called snd-azt3328. | 135 | will be called snd-azt3328. |
136 | 136 | ||
137 | config SND_BT87X | 137 | config SND_BT87X |
138 | tristate "Bt87x Audio Capture" | 138 | tristate "Bt87x Audio Capture" |
139 | depends on SND | 139 | depends on SND |
140 | select SND_PCM | 140 | select SND_PCM |
141 | help | 141 | help |
142 | If you want to record audio from TV cards based on | 142 | If you want to record audio from TV cards based on |
143 | Brooktree Bt878/Bt879 chips, say Y here and read | 143 | Brooktree Bt878/Bt879 chips, say Y here and read |
144 | <file:Documentation/sound/alsa/Bt87x.txt>. | 144 | <file:Documentation/sound/alsa/Bt87x.txt>. |
@@ -209,7 +209,7 @@ config SND_CS46XX | |||
209 | config SND_CS46XX_NEW_DSP | 209 | config SND_CS46XX_NEW_DSP |
210 | bool "Cirrus Logic (Sound Fusion) New DSP support" | 210 | bool "Cirrus Logic (Sound Fusion) New DSP support" |
211 | depends on SND_CS46XX | 211 | depends on SND_CS46XX |
212 | default y | 212 | default y |
213 | help | 213 | help |
214 | Say Y here to use a new DSP image for SPDIF and dual codecs. | 214 | Say Y here to use a new DSP image for SPDIF and dual codecs. |
215 | 215 | ||
@@ -225,7 +225,7 @@ config SND_CS5535AUDIO | |||
225 | referred to as NS CS5535 IO or AMD CS5535 IO companion in | 225 | referred to as NS CS5535 IO or AMD CS5535 IO companion in |
226 | various literature. This driver also supports the CS5536 audio | 226 | various literature. This driver also supports the CS5536 audio |
227 | device. However, for both chips, on certain boards, you may | 227 | device. However, for both chips, on certain boards, you may |
228 | need to use ac97_quirk=hp_only if your board has physically | 228 | need to use ac97_quirk=hp_only if your board has physically |
229 | mapped headphone out to master output. If that works for you, | 229 | mapped headphone out to master output. If that works for you, |
230 | send lspci -vvv output to the mailing list so that your board | 230 | send lspci -vvv output to the mailing list so that your board |
231 | can be identified in the quirks list. | 231 | can be identified in the quirks list. |
@@ -468,11 +468,13 @@ config SND_FM801_TEA575X_BOOL | |||
468 | FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media | 468 | FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media |
469 | Forte SF256-PCS-02) into the snd-fm801 driver. | 469 | Forte SF256-PCS-02) into the snd-fm801 driver. |
470 | 470 | ||
471 | This will enable support for the old V4L1 API. | ||
472 | |||
471 | config SND_FM801_TEA575X | 473 | config SND_FM801_TEA575X |
472 | tristate | 474 | tristate |
473 | depends on SND_FM801_TEA575X_BOOL | 475 | depends on SND_FM801_TEA575X_BOOL |
474 | default SND_FM801 | 476 | default SND_FM801 |
475 | select VIDEO_DEV | 477 | select VIDEO_V4L1 |
476 | 478 | ||
477 | config SND_HDA_INTEL | 479 | config SND_HDA_INTEL |
478 | tristate "Intel HD Audio" | 480 | tristate "Intel HD Audio" |