8 files changed, 0 insertions, 13 deletions

diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 7a9eeca6adc2..a60608722495 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -523,8 +523,6 @@ static int pcnet_confcheck(struct pcmcia_device *p_dev,
         if (cfg->index == 0 || cfg->io.nwin == 0)
                 return -EINVAL;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* For multifunction cards, by convention, we configure the
            network function with window 0, and serial with window 1 */
         if (io->nwin > 1) {
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index c012e3400736..1e595038a492 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -464,7 +464,6 @@ static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
                                 void *priv_data)
 {
         int k;
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort2 = cf->io.win[0].base;
         for (k = 0; k < 0x400; k += 0x10) {
                 if (k & 0x80)
@@ -654,7 +653,6 @@ static int smc_configcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cf,
                            void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
         return pcmcia_request_io(p_dev, &p_dev->io);
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index b57f022952b4..b0de704f229c 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -724,7 +724,6 @@ xirc2ps_config_modem(struct pcmcia_device *p_dev,
 
         if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
                 for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
-                        p_dev->conf.ConfigIndex = cf->index ;
                         p_dev->io.BasePort2 = cf->io.win[0].base;
                         p_dev->io.BasePort1 = ioaddr;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))
@@ -742,7 +741,6 @@ xirc2ps_config_check(struct pcmcia_device *p_dev,
         int *pass = priv_data;
 
         if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
-                p_dev->conf.ConfigIndex = cf->index ;
                 p_dev->io.BasePort2 = cf->io.win[0].base;
                 p_dev->io.BasePort1 = p_dev->io.BasePort2
                         + (*pass ? (cf->index & 0x20 ? -24:8)
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 4fbe811bebfc..d7216730f18e 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -223,8 +223,6 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
         if (cfg->index == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
                 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 263c36f7ee22..12efd44d64a1 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -234,8 +234,6 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
                 *dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
                 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3d914dde5de0..2abaa90b799d 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -552,7 +552,6 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
         if (cfg->index == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cfg->index;
         PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
                "(default 0x%02X)\n", cfg->index, cfg_mem->dflt.index);
 
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 473370c9e0d6..67a172dfb2db 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -179,7 +179,6 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
                 cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 goto next_entry;
-        p_dev->conf.ConfigIndex = cfg->index;
 
         /* Use power settings for Vcc and Vpp if present */
         /* Note that the CIS values need to be rescaled */
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 8e1951cfc152..7536aa91dad7 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -648,7 +648,6 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
                 cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 goto next_entry;
-        p_dev->conf.ConfigIndex = cfg->index;
 
         /* Use power settings for Vcc and Vpp if present */
         /* Note that the CIS values need to be rescaled */