diff options
-rw-r--r-- | drivers/serial/serial_cs.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index dadd686c9801..526307368f8b 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -715,6 +715,8 @@ static struct pcmcia_device_id serial_ids[] = { | |||
715 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021), | 715 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021), |
716 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a), | 716 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a), |
717 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a), | 717 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a), |
718 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a), | ||
719 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a), | ||
718 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0xea15), | 720 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0xea15), |
719 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0109, 0x0501), | 721 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0109, 0x0501), |
720 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0138, 0x110a), | 722 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0138, 0x110a), |
@@ -724,8 +726,6 @@ static struct pcmcia_device_id serial_ids[] = { | |||
724 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081), | 726 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081), |
725 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101), | 727 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101), |
726 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab), | 728 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab), |
727 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a), | ||
728 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a), | ||
729 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), | 729 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), |
730 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63), | 730 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63), |
731 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef), | 731 | PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef), |
@@ -768,17 +768,26 @@ static struct pcmcia_device_id serial_ids[] = { | |||
768 | PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x0276), | 768 | PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x0276), |
769 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0039), | 769 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0039), |
770 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0006), | 770 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0006), |
771 | PCMCIA_DEVICE_MANF_CARD(0x0105, 0x0101), /* TDK DF2814 */ | ||
772 | PCMCIA_DEVICE_MANF_CARD(0x0105, 0x100a), /* Xircom CM-56G */ | ||
773 | PCMCIA_DEVICE_MANF_CARD(0x0105, 0x3e0a), /* TDK DF5660 */ | ||
771 | PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a), | 774 | PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a), |
775 | PCMCIA_DEVICE_MANF_CARD(0x0107, 0x0002), /* USRobotics 14,400 */ | ||
772 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d50), | 776 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d50), |
773 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d51), | 777 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d51), |
774 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d52), | 778 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d52), |
775 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d53), | 779 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d53), |
776 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0xd180), | 780 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0xd180), |
781 | PCMCIA_DEVICE_MANF_CARD(0x0115, 0x3330), /* USRobotics/SUN 14,400 */ | ||
782 | PCMCIA_DEVICE_MANF_CARD(0x0124, 0x0100), /* Nokia DTP-2 ver II */ | ||
783 | PCMCIA_DEVICE_MANF_CARD(0x0134, 0x5600), /* LASAT COMMUNICATIONS A/S */ | ||
777 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x000e), | 784 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x000e), |
778 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x001b), | 785 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x001b), |
779 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025), | 786 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025), |
780 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045), | 787 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045), |
781 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052), | 788 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052), |
789 | PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */ | ||
790 | PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */ | ||
782 | PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae), | 791 | PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae), |
783 | PCMCIA_DEVICE_PROD_ID124("GATEWAY2000", "CC3144", "PCMCIA MODEM", 0x506bccae, 0xcb3685f1, 0xbd6c43ef), | 792 | PCMCIA_DEVICE_PROD_ID124("GATEWAY2000", "CC3144", "PCMCIA MODEM", 0x506bccae, 0xcb3685f1, 0xbd6c43ef), |
784 | PCMCIA_DEVICE_PROD_ID14("MEGAHERTZ", "PCMCIA MODEM", 0xf510db04, 0xbd6c43ef), | 793 | PCMCIA_DEVICE_PROD_ID14("MEGAHERTZ", "PCMCIA MODEM", 0xf510db04, 0xbd6c43ef), |
@@ -792,16 +801,21 @@ static struct pcmcia_device_id serial_ids[] = { | |||
792 | PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 33600 FAX/DATA MODEM", 0xa3a3062c, 0x5a00ce95), | 801 | PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 33600 FAX/DATA MODEM", 0xa3a3062c, 0x5a00ce95), |
793 | PCMCIA_DEVICE_PROD_ID12("Computerboards, Inc.", "PCM-COM422", 0xd0b78f51, 0x7e2d49ed), | 802 | PCMCIA_DEVICE_PROD_ID12("Computerboards, Inc.", "PCM-COM422", 0xd0b78f51, 0x7e2d49ed), |
794 | PCMCIA_DEVICE_PROD_ID12("Dr. Neuhaus", "FURY CARD 14K4", 0x76942813, 0x8b96ce65), | 803 | PCMCIA_DEVICE_PROD_ID12("Dr. Neuhaus", "FURY CARD 14K4", 0x76942813, 0x8b96ce65), |
804 | PCMCIA_DEVICE_PROD_ID12("IBM", "ISDN/56K/GSM", 0xb569a6e5, 0xfee5297b), | ||
795 | PCMCIA_DEVICE_PROD_ID12("Intelligent", "ANGIA FAX/MODEM", 0xb496e65e, 0xf31602a6), | 805 | PCMCIA_DEVICE_PROD_ID12("Intelligent", "ANGIA FAX/MODEM", 0xb496e65e, 0xf31602a6), |
796 | PCMCIA_DEVICE_PROD_ID12("Intel", "MODEM 2400+", 0x816cc815, 0x412729fb), | 806 | PCMCIA_DEVICE_PROD_ID12("Intel", "MODEM 2400+", 0x816cc815, 0x412729fb), |
807 | PCMCIA_DEVICE_PROD_ID12("Intertex", "IX34-PCMCIA", 0xf8a097e3, 0x97880447), | ||
797 | PCMCIA_DEVICE_PROD_ID12("IOTech Inc ", "PCMCIA Dual RS-232 Serial Port Card", 0x3bd2d898, 0x92abc92f), | 808 | PCMCIA_DEVICE_PROD_ID12("IOTech Inc ", "PCMCIA Dual RS-232 Serial Port Card", 0x3bd2d898, 0x92abc92f), |
798 | PCMCIA_DEVICE_PROD_ID12("MACRONIX", "FAX/MODEM", 0x668388b3, 0x3f9bdf2f), | 809 | PCMCIA_DEVICE_PROD_ID12("MACRONIX", "FAX/MODEM", 0x668388b3, 0x3f9bdf2f), |
799 | PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT1432LT", 0x5f73be51, 0x0b3e2383), | 810 | PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT1432LT", 0x5f73be51, 0x0b3e2383), |
800 | PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT2834LT", 0x5f73be51, 0x4cd7c09e), | 811 | PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT2834LT", 0x5f73be51, 0x4cd7c09e), |
801 | PCMCIA_DEVICE_PROD_ID12("OEM ", "C288MX ", 0xb572d360, 0xd2385b7a), | 812 | PCMCIA_DEVICE_PROD_ID12("OEM ", "C288MX ", 0xb572d360, 0xd2385b7a), |
813 | PCMCIA_DEVICE_PROD_ID12("Option International", "V34bis GSM/PSTN Data/Fax Modem", 0x9d7cd6f5, 0x5cb8bf41), | ||
802 | PCMCIA_DEVICE_PROD_ID12("PCMCIA ", "C336MX ", 0x99bcafe9, 0xaa25bcab), | 814 | PCMCIA_DEVICE_PROD_ID12("PCMCIA ", "C336MX ", 0x99bcafe9, 0xaa25bcab), |
803 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f), | 815 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f), |
804 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d), | 816 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d), |
817 | PCMCIA_DEVICE_PROD_ID12("Telia", "SurfinBird 560P/A+", 0xe2cdd5e, 0xc9314b38), | ||
818 | PCMCIA_DEVICE_PROD_ID1("Smart Serial Port", 0x2d8ce292), | ||
805 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"), | 819 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"), |
806 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"), | 820 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"), |
807 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"), | 821 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"), |