From 4dd49c9b73e408db77daeeb3272c74a46642aef6 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 10 Sep 2009 12:20:07 +0200 Subject: [PATCH] --- yaml --- r: 163867 b: refs/heads/master c: 502f295f6ca5cd034c69b0662b251ffdeed95d33 h: refs/heads/master i: 163865: 9d598a31f58d664b5562268f12e2daf6fbc3a62a 163863: 450229c411e3c2b91baf67a2ea692307aada7bf3 v: v3 --- [refs] | 2 +- trunk/drivers/char/mxser.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0c770e8438a8..12de55927e5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2cfe9628c6187cafd1aac32a44dcd9ed7adb5fe +refs/heads/master: 502f295f6ca5cd034c69b0662b251ffdeed95d33 diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c index 37058ff7da7d..e218ae29b482 100644 --- a/trunk/drivers/char/mxser.c +++ b/trunk/drivers/char/mxser.c @@ -48,7 +48,7 @@ #include "mxser.h" -#define MXSER_VERSION "2.0.4" /* 1.12 */ +#define MXSER_VERSION "2.0.5" /* 1.14 */ #define MXSERMAJOR 174 #define MXSER_BOARDS 4 /* Max. boards */ @@ -69,6 +69,7 @@ #define PCI_DEVICE_ID_POS104UL 0x1044 #define PCI_DEVICE_ID_CB108 0x1080 #define PCI_DEVICE_ID_CP102UF 0x1023 +#define PCI_DEVICE_ID_CP112UL 0x1120 #define PCI_DEVICE_ID_CB114 0x1142 #define PCI_DEVICE_ID_CP114UL 0x1143 #define PCI_DEVICE_ID_CB134I 0x1341 @@ -139,7 +140,8 @@ static const struct mxser_cardinfo mxser_cards[] = { { "CP-138U series", 8, }, { "POS-104UL series", 4, }, { "CP-114UL series", 4, }, -/*30*/ { "CP-102UF series", 2, } +/*30*/ { "CP-102UF series", 2, }, + { "CP-112UL series", 2, }, }; /* driver_data correspond to the lines in the structure above @@ -170,6 +172,7 @@ static struct pci_device_id mxser_pcibrds[] = { { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 28 }, { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL), .driver_data = 29 }, { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF), .driver_data = 30 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL), .driver_data = 31 }, { } }; MODULE_DEVICE_TABLE(pci, mxser_pcibrds);