diff options
Diffstat (limited to 'drivers/net/pcmcia/fmvj18x_cs.c')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 62efbc7c2dca..34bf963b1296 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -257,7 +257,6 @@ static int fmvj18x_attach(struct pcmcia_device *p_dev) | |||
257 | 257 | ||
258 | /* General socket configuration */ | 258 | /* General socket configuration */ |
259 | link->conf.Attributes = CONF_ENABLE_IRQ; | 259 | link->conf.Attributes = CONF_ENABLE_IRQ; |
260 | link->conf.Vcc = 50; | ||
261 | link->conf.IntType = INT_MEMORY_AND_IO; | 260 | link->conf.IntType = INT_MEMORY_AND_IO; |
262 | 261 | ||
263 | /* The FMVJ18x specific entries in the device structure. */ | 262 | /* The FMVJ18x specific entries in the device structure. */ |
@@ -396,12 +395,7 @@ static void fmvj18x_config(dev_link_t *link) | |||
396 | switch (le16_to_cpu(buf[0])) { | 395 | switch (le16_to_cpu(buf[0])) { |
397 | case MANFID_TDK: | 396 | case MANFID_TDK: |
398 | cardtype = TDK; | 397 | cardtype = TDK; |
399 | if (le16_to_cpu(buf[1]) == PRODID_TDK_CF010) { | 398 | if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410 |
400 | cs_status_t status; | ||
401 | pcmcia_get_status(handle, &status); | ||
402 | if (status.CardState & CS_EVENT_3VCARD) | ||
403 | link->conf.Vcc = 33; /* inserted in 3.3V slot */ | ||
404 | } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410 | ||
405 | || le16_to_cpu(buf[1]) == PRODID_TDK_NP9610 | 399 | || le16_to_cpu(buf[1]) == PRODID_TDK_NP9610 |
406 | || le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) { | 400 | || le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) { |
407 | /* MultiFunction Card */ | 401 | /* MultiFunction Card */ |