diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 12:23:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 12:23:08 -0400 |
commit | f33c596a2f921696391801b637ed50d514634079 (patch) | |
tree | abc353fe3ef128e60e20a6b73f52858ce6d39eff /drivers/net | |
parent | 250f8e3db646028353a2a737ddb7a894c97a1098 (diff) | |
parent | 74411c04540404a1ff29d254584ef393e150aeda (diff) |
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
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 1cd9394c3359..cffbc0373fa9 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -809,7 +809,7 @@ static int smc91c92_config(struct pcmcia_device *link) | |||
809 | struct net_device *dev = link->priv; | 809 | struct net_device *dev = link->priv; |
810 | struct smc_private *smc = netdev_priv(dev); | 810 | struct smc_private *smc = netdev_priv(dev); |
811 | char *name; | 811 | char *name; |
812 | int i, j, rev; | 812 | int i, rev, j = 0; |
813 | unsigned int ioaddr; | 813 | unsigned int ioaddr; |
814 | u_long mir; | 814 | u_long mir; |
815 | 815 | ||
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index c052a0d5cbdd..5441ad195119 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -648,6 +648,8 @@ static const struct pcmcia_device_id hostap_cs_ids[] = { | |||
648 | 0x74c5e40d), | 648 | 0x74c5e40d), |
649 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", | 649 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", |
650 | 0x4b801a17), | 650 | 0x4b801a17), |
651 | PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.02", | ||
652 | 0x4b74baa0), | ||
651 | PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", | 653 | PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", |
652 | 0x7a954bd9, 0x74be00c6), | 654 | 0x7a954bd9, 0x74be00c6), |
653 | PCMCIA_DEVICE_PROD_ID123( | 655 | PCMCIA_DEVICE_PROD_ID123( |
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 3f7fc4a0b43d..d7dbc00bcfbe 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -239,7 +239,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link) | |||
239 | 239 | ||
240 | static const struct pcmcia_device_id orinoco_cs_ids[] = { | 240 | static const struct pcmcia_device_id orinoco_cs_ids[] = { |
241 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ | 241 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ |
242 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */ | ||
243 | PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */ | 242 | PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */ |
244 | PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */ | 243 | PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */ |
245 | PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */ | 244 | PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */ |
@@ -272,6 +271,7 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = { | |||
272 | PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), | 271 | PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), |
273 | PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b), | 272 | PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b), |
274 | PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), | 273 | PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), |
274 | PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.01", 0xd27deb1a), /* Lucent Orinoco */ | ||
275 | #ifdef CONFIG_HERMES_PRISM | 275 | #ifdef CONFIG_HERMES_PRISM |
276 | /* Only entries that certainly identify Prism chipset */ | 276 | /* Only entries that certainly identify Prism chipset */ |
277 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */ | 277 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */ |
@@ -321,6 +321,9 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = { | |||
321 | PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2), | 321 | PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2), |
322 | PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b), | 322 | PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b), |
323 | PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39), | 323 | PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39), |
324 | |||
325 | /* This may be Agere or Intersil Firmware */ | ||
326 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), | ||
324 | #endif | 327 | #endif |
325 | PCMCIA_DEVICE_NULL, | 328 | PCMCIA_DEVICE_NULL, |
326 | }; | 329 | }; |