Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f33c596a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/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
parents 250f8e3d 74411c04

drivers/net/pcmcia/smc91c92_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static int smc91c92_config(struct pcmcia_device *link) 
    struct net_device *dev = link->priv;

    struct smc_private *smc = netdev_priv(dev);

    char *name;

    int i, j, rev;

    int i, rev, j = 0;

    unsigned int ioaddr;

    u_long mir;

drivers/net/wireless/hostap/hostap_cs.c

+2 −0
Original line number Diff line number Diff line
@@ -648,6 +648,8 @@ static const struct pcmcia_device_id hostap_cs_ids[] = { 
					 0x74c5e40d),

	PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",

					 0x4b801a17),

	PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.02",

					 0x4b74baa0),

	PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",

				    0x7a954bd9, 0x74be00c6),

	PCMCIA_DEVICE_PROD_ID123(

drivers/net/wireless/orinoco/orinoco_cs.c

+4 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link) 


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 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = { 
	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 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = { 
	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,

};

drivers/pcmcia/pxa2xx_balloon3.c

+0 −10
Original line number Diff line number Diff line
@@ -103,22 +103,12 @@ static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	return 0;

}



static void balloon3_pcmcia_socket_init(struct soc_pcmcia_socket *skt)

{

}



static void balloon3_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)

{

}



static struct pcmcia_low_level balloon3_pcmcia_ops = {

	.owner			= THIS_MODULE,

	.hw_init		= balloon3_pcmcia_hw_init,

	.hw_shutdown		= balloon3_pcmcia_hw_shutdown,

	.socket_state		= balloon3_pcmcia_socket_state,

	.configure_socket	= balloon3_pcmcia_configure_socket,

	.socket_init		= balloon3_pcmcia_socket_init,

	.socket_suspend		= balloon3_pcmcia_socket_suspend,

	.first			= 0,

	.nr			= 1,

};

drivers/pcmcia/pxa2xx_cm_x255.c

+0 −11
Original line number Diff line number Diff line
@@ -102,23 +102,12 @@ static int cmx255_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, 
	return 0;

}



static void cmx255_pcmcia_socket_init(struct soc_pcmcia_socket *skt)

{

}



static void cmx255_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)

{

}





static struct pcmcia_low_level cmx255_pcmcia_ops __initdata = {

	.owner			= THIS_MODULE,

	.hw_init		= cmx255_pcmcia_hw_init,

	.hw_shutdown		= cmx255_pcmcia_shutdown,

	.socket_state		= cmx255_pcmcia_socket_state,

	.configure_socket	= cmx255_pcmcia_configure_socket,

	.socket_init		= cmx255_pcmcia_socket_init,

	.socket_suspend		= cmx255_pcmcia_socket_suspend,

	.nr			= 1,

};