diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 6 | ||||
-rw-r--r-- | drivers/serial/serial_cs.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index b17aedd5e5a4..917adbbf0b5b 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -435,7 +435,9 @@ static void fmvj18x_config(dev_link_t *link) | |||
435 | pcmcia_get_status(handle, &status); | 435 | pcmcia_get_status(handle, &status); |
436 | if (status.CardState & CS_EVENT_3VCARD) | 436 | if (status.CardState & CS_EVENT_3VCARD) |
437 | link->conf.Vcc = 33; /* inserted in 3.3V slot */ | 437 | link->conf.Vcc = 33; /* inserted in 3.3V slot */ |
438 | } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410) { | 438 | } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410 |
439 | || le16_to_cpu(buf[1]) == PRODID_TDK_NP9610 | ||
440 | || le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) { | ||
439 | /* MultiFunction Card */ | 441 | /* MultiFunction Card */ |
440 | link->conf.ConfigBase = 0x800; | 442 | link->conf.ConfigBase = 0x800; |
441 | link->conf.ConfigIndex = 0x47; | 443 | link->conf.ConfigIndex = 0x47; |
@@ -783,6 +785,8 @@ static struct pcmcia_device_id fmvj18x_ids[] = { | |||
783 | PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da), | 785 | PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da), |
784 | PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080), | 786 | PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080), |
785 | PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed), | 787 | PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed), |
788 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a), | ||
789 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a), | ||
786 | PCMCIA_DEVICE_NULL, | 790 | PCMCIA_DEVICE_NULL, |
787 | }; | 791 | }; |
788 | MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids); | 792 | MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids); |
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index ca86f1f668fe..73a34b18866f 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -785,6 +785,8 @@ static struct pcmcia_device_id serial_ids[] = { | |||
785 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081), | 785 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081), |
786 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101), | 786 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101), |
787 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab), | 787 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab), |
788 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a), | ||
789 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a), | ||
788 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), | 790 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), |
789 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63), | 791 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63), |
790 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef), | 792 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef), |