From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Jul 2011 16:23:08 +0000 (-1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v3.1-rc1~108
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f33c596a2f921696391801b637ed50d514634079;hp=-c

Merge git://git./linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  smc91c92_cs.c: fix bogus compiler warning
  orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002
  hostap_cs: support cards with "Version 01.02" as third product ID
  pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
  pxa2xx pcmcia - stargate 2 use gpio array.
  pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
  drivers:pcmcia:soc_common: make socket_init and socket_suspend optional
---

f33c596a2f921696391801b637ed50d514634079
diff --combined drivers/net/wireless/orinoco/orinoco_cs.c
index 3f7fc4a0b43d,bb0d1334f54e..d7dbc00bcfbe
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@@ -65,7 -65,7 +65,7 @@@ static void orinoco_cs_release(struct p
  static void orinoco_cs_detach(struct pcmcia_device *p_dev);
  
  /********************************************************************/
 -/* Device methods     						    */
 +/* Device methods						    */
  /********************************************************************/
  
  static int
@@@ -89,7 -89,7 +89,7 @@@ orinoco_cs_hard_reset(struct orinoco_pr
  }
  
  /********************************************************************/
 -/* PCMCIA stuff     						    */
 +/* PCMCIA stuff							    */
  /********************************************************************/
  
  static int
@@@ -134,7 -134,7 +134,7 @@@ static in
  orinoco_cs_config(struct pcmcia_device *link)
  {
  	struct orinoco_private *priv = link->priv;
 -	hermes_t *hw = &priv->hw;
 +	struct hermes *hw = &priv->hw;
  	int ret;
  	void __iomem *mem;
  
@@@ -239,7 -239,6 +239,6 @@@ static int orinoco_cs_resume(struct pcm
  
  static const struct pcmcia_device_id orinoco_cs_ids[] = {
  	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */
- 	PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */
  	PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */
  	PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */
  	PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */
@@@ -272,6 -271,7 +271,7 @@@
  	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
  	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
  	PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),
+ 	PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.01", 0xd27deb1a), /* Lucent Orinoco */
  #ifdef CONFIG_HERMES_PRISM
  	/* Only entries that certainly identify Prism chipset */
  	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */
@@@ -321,6 -321,9 +321,9 @@@
  	PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),
  	PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),
  	PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),
+ 
+ 	/* This may be Agere or Intersil Firmware */
+ 	PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
  #endif
  	PCMCIA_DEVICE_NULL,
  };