- orinoco-remove-pcmcia-audio-support-its-useless-for-wireless-cards.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     orinoco: remove PCMCIA audio support, it's useless for wireless cards

has been removed from the -mm tree.  Its filename is

     orinoco-remove-pcmcia-audio-support-its-useless-for-wireless-cards.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.


From: Pavel Roskin <proski@xxxxxxx>

Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/net/wireless/orinoco_cs.c  |    6 ------
 drivers/net/wireless/spectrum_cs.c |    6 ------
 2 files changed, 12 deletions(-)

diff -puN drivers/net/wireless/orinoco_cs.c~orinoco-remove-pcmcia-audio-support-its-useless-for-wireless-cards drivers/net/wireless/orinoco_cs.c
--- devel/drivers/net/wireless/orinoco_cs.c~orinoco-remove-pcmcia-audio-support-its-useless-for-wireless-cards	2006-04-14 23:41:46.000000000 -0700
+++ devel-akpm/drivers/net/wireless/orinoco_cs.c	2006-04-14 23:41:46.000000000 -0700
@@ -231,12 +231,6 @@ orinoco_cs_config(struct pcmcia_device *
 			goto next_entry;
 		link->conf.ConfigIndex = cfg->index;
 
-		/* Does this card need audio output? */
-		if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-			link->conf.Attributes |= CONF_ENABLE_SPKR;
-			link->conf.Status = CCSR_AUDIO_ENA;
-		}
-
 		/* Use power settings for Vcc and Vpp if present */
 		/* Note that the CIS values need to be rescaled */
 		if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
diff -puN drivers/net/wireless/spectrum_cs.c~orinoco-remove-pcmcia-audio-support-its-useless-for-wireless-cards drivers/net/wireless/spectrum_cs.c
--- devel/drivers/net/wireless/spectrum_cs.c~orinoco-remove-pcmcia-audio-support-its-useless-for-wireless-cards	2006-04-14 23:41:46.000000000 -0700
+++ devel-akpm/drivers/net/wireless/spectrum_cs.c	2006-04-14 23:41:46.000000000 -0700
@@ -706,12 +706,6 @@ spectrum_cs_config(struct pcmcia_device 
 			goto next_entry;
 		link->conf.ConfigIndex = cfg->index;
 
-		/* Does this card need audio output? */
-		if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-			link->conf.Attributes |= CONF_ENABLE_SPKR;
-			link->conf.Status = CCSR_AUDIO_ENA;
-		}
-
 		/* Use power settings for Vcc and Vpp if present */
 		/* Note that the CIS values need to be rescaled */
 		if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
_

Patches currently in -mm which might be from proski@xxxxxxx are

origin.patch
git-wireless.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux