aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/airo_cs.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c2
-rw-r--r--drivers/net/wireless/ray_cs.c2
-rw-r--r--drivers/net/wireless/wl3501_cs.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index ccb2fdde002c..40f9ed760bb3 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -240,7 +240,7 @@ static int airo_config(struct pcmcia_device *link)
240 240
241 /* Finally, report what we've done */ 241 /* Finally, report what we've done */
242 dev_info(&link->dev, "index 0x%02x: ", 242 dev_info(&link->dev, "index 0x%02x: ",
243 link->conf.ConfigIndex); 243 link->config_index);
244 if (link->vpp) 244 if (link->vpp)
245 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); 245 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
246 printk(", irq %d", link->irq); 246 printk(", irq %d", link->irq);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 0fe6f82cda58..5704d3f9e1b7 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -601,7 +601,7 @@ static int prism2_config(struct pcmcia_device *link)
601 601
602 /* Finally, report what we've done */ 602 /* Finally, report what we've done */
603 printk(KERN_INFO "%s: index 0x%02x: ", 603 printk(KERN_INFO "%s: index 0x%02x: ",
604 dev_info, link->conf.ConfigIndex); 604 dev_info, link->config_index);
605 if (link->vpp) 605 if (link->vpp)
606 printk(", Vpp %d.%d", link->vpp / 10, 606 printk(", Vpp %d.%d", link->vpp / 10,
607 link->vpp % 10); 607 link->vpp % 10);
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 30cfd8890e34..7fb66cc1e9fd 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -319,7 +319,7 @@ static int ray_probe(struct pcmcia_device *p_dev)
319 319
320 /* General socket configuration */ 320 /* General socket configuration */
321 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 321 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
322 p_dev->conf.ConfigIndex = 1; 322 p_dev->config_index = 1;
323 323
324 p_dev->priv = dev; 324 p_dev->priv = dev;
325 325
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 92a9ad575cc7..3947cf8e63c5 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1889,7 +1889,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
1889 1889
1890 /* General socket configuration */ 1890 /* General socket configuration */
1891 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 1891 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
1892 p_dev->conf.ConfigIndex = 1; 1892 p_dev->config_index = 1;
1893 1893
1894 dev = alloc_etherdev(sizeof(struct wl3501_card)); 1894 dev = alloc_etherdev(sizeof(struct wl3501_card));
1895 if (!dev) 1895 if (!dev)