aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/8250
diff options
context:
space:
mode:
authorShawn Bohrer <shawn.bohrer@gmail.com>2012-05-28 16:20:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-12 18:48:02 -0400
commitee4cd1b225368abed7e0f4d344f1e9a93e87b98e (patch)
tree15064ee42e8d9ce0feed649f46d24d1a9a443a96 /drivers/tty/serial/8250
parent596f93f50e2d1a926bbb6c73aa7ee7fd862b7062 (diff)
8250_pci: Remove duplicate struct pciserial_board
pbn_exsys_4055 is the same thing as pbn_b2_4_115200 so replace it with the standard pattern. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250')
-rw-r--r--drivers/tty/serial/8250/8250_pci.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 28e7c7cce89..66e5909d0a1 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1887,7 +1887,6 @@ enum pci_board_num_t {
1887 pbn_panacom, 1887 pbn_panacom,
1888 pbn_panacom2, 1888 pbn_panacom2,
1889 pbn_panacom4, 1889 pbn_panacom4,
1890 pbn_exsys_4055,
1891 pbn_plx_romulus, 1890 pbn_plx_romulus,
1892 pbn_oxsemi, 1891 pbn_oxsemi,
1893 pbn_oxsemi_1_4000000, 1892 pbn_oxsemi_1_4000000,
@@ -2393,13 +2392,6 @@ static struct pciserial_board pci_boards[] __devinitdata = {
2393 .reg_shift = 7, 2392 .reg_shift = 7,
2394 }, 2393 },
2395 2394
2396 [pbn_exsys_4055] = {
2397 .flags = FL_BASE2,
2398 .num_ports = 4,
2399 .base_baud = 115200,
2400 .uart_offset = 8,
2401 },
2402
2403 /* I think this entry is broken - the first_offset looks wrong --rmk */ 2395 /* I think this entry is broken - the first_offset looks wrong --rmk */
2404 [pbn_plx_romulus] = { 2396 [pbn_plx_romulus] = {
2405 .flags = FL_BASE2, 2397 .flags = FL_BASE2,
@@ -3193,7 +3185,7 @@ static struct pci_device_id serial_pci_tbl[] = {
3193 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, 3185 { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
3194 PCI_SUBVENDOR_ID_EXSYS, 3186 PCI_SUBVENDOR_ID_EXSYS,
3195 PCI_SUBDEVICE_ID_EXSYS_4055, 0, 0, 3187 PCI_SUBDEVICE_ID_EXSYS_4055, 0, 0,
3196 pbn_exsys_4055 }, 3188 pbn_b2_4_115200 },
3197 /* 3189 /*
3198 * Megawolf Romulus PCI Serial Card, from Mike Hudson 3190 * Megawolf Romulus PCI Serial Card, from Mike Hudson
3199 * (Exoray@isys.ca) 3191 * (Exoray@isys.ca)