diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-09-10 06:20:07 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:38 -0400 |
commit | 502f295f6ca5cd034c69b0662b251ffdeed95d33 (patch) | |
tree | 385df218b34c0111e9392c9b9c909206c5eb793c /drivers/char/mxser.c | |
parent | d2cfe9628c6187cafd1aac32a44dcd9ed7adb5fe (diff) |
tty: Char: mxser, add support for CP112UL
Add support for MOXA:0x1120 pci device. It's a 2-port device and differs
in no way from the others. So this turns out to be a trivial
pci_device_id change.
Increase also the version number.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/mxser.c')
-rw-r--r-- | drivers/char/mxser.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 37058ff7da7d..e218ae29b482 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | #include "mxser.h" | 49 | #include "mxser.h" |
50 | 50 | ||
51 | #define MXSER_VERSION "2.0.4" /* 1.12 */ | 51 | #define MXSER_VERSION "2.0.5" /* 1.14 */ |
52 | #define MXSERMAJOR 174 | 52 | #define MXSERMAJOR 174 |
53 | 53 | ||
54 | #define MXSER_BOARDS 4 /* Max. boards */ | 54 | #define MXSER_BOARDS 4 /* Max. boards */ |
@@ -69,6 +69,7 @@ | |||
69 | #define PCI_DEVICE_ID_POS104UL 0x1044 | 69 | #define PCI_DEVICE_ID_POS104UL 0x1044 |
70 | #define PCI_DEVICE_ID_CB108 0x1080 | 70 | #define PCI_DEVICE_ID_CB108 0x1080 |
71 | #define PCI_DEVICE_ID_CP102UF 0x1023 | 71 | #define PCI_DEVICE_ID_CP102UF 0x1023 |
72 | #define PCI_DEVICE_ID_CP112UL 0x1120 | ||
72 | #define PCI_DEVICE_ID_CB114 0x1142 | 73 | #define PCI_DEVICE_ID_CB114 0x1142 |
73 | #define PCI_DEVICE_ID_CP114UL 0x1143 | 74 | #define PCI_DEVICE_ID_CP114UL 0x1143 |
74 | #define PCI_DEVICE_ID_CB134I 0x1341 | 75 | #define PCI_DEVICE_ID_CB134I 0x1341 |
@@ -139,7 +140,8 @@ static const struct mxser_cardinfo mxser_cards[] = { | |||
139 | { "CP-138U series", 8, }, | 140 | { "CP-138U series", 8, }, |
140 | { "POS-104UL series", 4, }, | 141 | { "POS-104UL series", 4, }, |
141 | { "CP-114UL series", 4, }, | 142 | { "CP-114UL series", 4, }, |
142 | /*30*/ { "CP-102UF series", 2, } | 143 | /*30*/ { "CP-102UF series", 2, }, |
144 | { "CP-112UL series", 2, }, | ||
143 | }; | 145 | }; |
144 | 146 | ||
145 | /* driver_data correspond to the lines in the structure above | 147 | /* driver_data correspond to the lines in the structure above |
@@ -170,6 +172,7 @@ static struct pci_device_id mxser_pcibrds[] = { | |||
170 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 28 }, | 172 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 28 }, |
171 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL), .driver_data = 29 }, | 173 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL), .driver_data = 29 }, |
172 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF), .driver_data = 30 }, | 174 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF), .driver_data = 30 }, |
175 | { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL), .driver_data = 31 }, | ||
173 | { } | 176 | { } |
174 | }; | 177 | }; |
175 | MODULE_DEVICE_TABLE(pci, mxser_pcibrds); | 178 | MODULE_DEVICE_TABLE(pci, mxser_pcibrds); |