diff options
Diffstat (limited to 'sound/pci/ac97/ac97_codec.c')
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index abc83fa85bcd..17c3ddac35cc 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -184,42 +184,6 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { | |||
184 | { 0, 0, NULL, NULL, NULL } | 184 | { 0, 0, NULL, NULL, NULL } |
185 | }; | 185 | }; |
186 | 186 | ||
187 | const char *snd_ac97_stereo_enhancements[] = | ||
188 | { | ||
189 | /* 0 */ "No 3D Stereo Enhancement", | ||
190 | /* 1 */ "Analog Devices Phat Stereo", | ||
191 | /* 2 */ "Creative Stereo Enhancement", | ||
192 | /* 3 */ "National Semi 3D Stereo Enhancement", | ||
193 | /* 4 */ "YAMAHA Ymersion", | ||
194 | /* 5 */ "BBE 3D Stereo Enhancement", | ||
195 | /* 6 */ "Crystal Semi 3D Stereo Enhancement", | ||
196 | /* 7 */ "Qsound QXpander", | ||
197 | /* 8 */ "Spatializer 3D Stereo Enhancement", | ||
198 | /* 9 */ "SRS 3D Stereo Enhancement", | ||
199 | /* 10 */ "Platform Tech 3D Stereo Enhancement", | ||
200 | /* 11 */ "AKM 3D Audio", | ||
201 | /* 12 */ "Aureal Stereo Enhancement", | ||
202 | /* 13 */ "Aztech 3D Enhancement", | ||
203 | /* 14 */ "Binaura 3D Audio Enhancement", | ||
204 | /* 15 */ "ESS Technology Stereo Enhancement", | ||
205 | /* 16 */ "Harman International VMAx", | ||
206 | /* 17 */ "Nvidea/IC Ensemble/KS Waves 3D Stereo Enhancement", | ||
207 | /* 18 */ "Philips Incredible Sound", | ||
208 | /* 19 */ "Texas Instruments 3D Stereo Enhancement", | ||
209 | /* 20 */ "VLSI Technology 3D Stereo Enhancement", | ||
210 | /* 21 */ "TriTech 3D Stereo Enhancement", | ||
211 | /* 22 */ "Realtek 3D Stereo Enhancement", | ||
212 | /* 23 */ "Samsung 3D Stereo Enhancement", | ||
213 | /* 24 */ "Wolfson Microelectronics 3D Enhancement", | ||
214 | /* 25 */ "Delta Integration 3D Enhancement", | ||
215 | /* 26 */ "SigmaTel 3D Enhancement", | ||
216 | /* 27 */ "IC Ensemble/KS Waves", | ||
217 | /* 28 */ "Rockwell 3D Stereo Enhancement", | ||
218 | /* 29 */ "Reserved 29", | ||
219 | /* 30 */ "Reserved 30", | ||
220 | /* 31 */ "Reserved 31" | ||
221 | }; | ||
222 | |||
223 | 187 | ||
224 | /* | 188 | /* |
225 | * I/O routines | 189 | * I/O routines |
@@ -1895,10 +1859,12 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, | |||
1895 | init_MUTEX(&ac97->reg_mutex); | 1859 | init_MUTEX(&ac97->reg_mutex); |
1896 | init_MUTEX(&ac97->page_mutex); | 1860 | init_MUTEX(&ac97->page_mutex); |
1897 | 1861 | ||
1862 | #ifdef CONFIG_PCI | ||
1898 | if (ac97->pci) { | 1863 | if (ac97->pci) { |
1899 | pci_read_config_word(ac97->pci, PCI_SUBSYSTEM_VENDOR_ID, &ac97->subsystem_vendor); | 1864 | pci_read_config_word(ac97->pci, PCI_SUBSYSTEM_VENDOR_ID, &ac97->subsystem_vendor); |
1900 | pci_read_config_word(ac97->pci, PCI_SUBSYSTEM_ID, &ac97->subsystem_device); | 1865 | pci_read_config_word(ac97->pci, PCI_SUBSYSTEM_ID, &ac97->subsystem_device); |
1901 | } | 1866 | } |
1867 | #endif | ||
1902 | if (bus->ops->reset) { | 1868 | if (bus->ops->reset) { |
1903 | bus->ops->reset(ac97); | 1869 | bus->ops->reset(ac97); |
1904 | goto __access_ok; | 1870 | goto __access_ok; |