diff options
author | Pavel Roskin <proski@gnu.org> | 2006-04-07 04:10:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-04-24 16:15:49 -0400 |
commit | b018779cbda646c37346433167145b4624c8979b (patch) | |
tree | de052210e58a6e694192e20eafb543ca6f9fd231 /drivers/net | |
parent | a6e26e8ddbe8717103556ecd8ecd383de32671e4 (diff) |
[PATCH] orinoco: remove PCMCIA audio support, it's useless for wireless cards
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/orinoco_cs.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/spectrum_cs.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 0e81312f0d43..d2c48ac60f46 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c | |||
@@ -231,12 +231,6 @@ orinoco_cs_config(struct pcmcia_device *link) | |||
231 | goto next_entry; | 231 | goto next_entry; |
232 | link->conf.ConfigIndex = cfg->index; | 232 | link->conf.ConfigIndex = cfg->index; |
233 | 233 | ||
234 | /* Does this card need audio output? */ | ||
235 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
236 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
237 | link->conf.Status = CCSR_AUDIO_ENA; | ||
238 | } | ||
239 | |||
240 | /* Use power settings for Vcc and Vpp if present */ | 234 | /* Use power settings for Vcc and Vpp if present */ |
241 | /* Note that the CIS values need to be rescaled */ | 235 | /* Note that the CIS values need to be rescaled */ |
242 | if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { | 236 | if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { |
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c index a15c5d3361d8..e5cb5329b436 100644 --- a/drivers/net/wireless/spectrum_cs.c +++ b/drivers/net/wireless/spectrum_cs.c | |||
@@ -706,12 +706,6 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
706 | goto next_entry; | 706 | goto next_entry; |
707 | link->conf.ConfigIndex = cfg->index; | 707 | link->conf.ConfigIndex = cfg->index; |
708 | 708 | ||
709 | /* Does this card need audio output? */ | ||
710 | if (cfg->flags & CISTPL_CFTABLE_AUDIO) { | ||
711 | link->conf.Attributes |= CONF_ENABLE_SPKR; | ||
712 | link->conf.Status = CCSR_AUDIO_ENA; | ||
713 | } | ||
714 | |||
715 | /* Use power settings for Vcc and Vpp if present */ | 709 | /* Use power settings for Vcc and Vpp if present */ |
716 | /* Note that the CIS values need to be rescaled */ | 710 | /* Note that the CIS values need to be rescaled */ |
717 | if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { | 711 | if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { |