Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee4cd1b2 authored by Shawn Bohrer's avatar Shawn Bohrer Committed by Greg Kroah-Hartman
Browse files

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: default avatarShawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 596f93f5

drivers/tty/serial/8250/8250_pci.c

+1 −9
Original line number Diff line number Diff line
@@ -1887,7 +1887,6 @@ enum pci_board_num_t { 
	pbn_panacom,

	pbn_panacom2,

	pbn_panacom4,

	pbn_exsys_4055,

	pbn_plx_romulus,

	pbn_oxsemi,

	pbn_oxsemi_1_4000000,
@@ -2393,13 +2392,6 @@ static struct pciserial_board pci_boards[] __devinitdata = { 
		.reg_shift	= 7,

	},



	[pbn_exsys_4055] = {

		.flags		= FL_BASE2,

		.num_ports	= 4,

		.base_baud	= 115200,

		.uart_offset	= 8,

	},



	/* I think this entry is broken - the first_offset looks wrong --rmk */

	[pbn_plx_romulus] = {

		.flags		= FL_BASE2,
@@ -3193,7 +3185,7 @@ static struct pci_device_id serial_pci_tbl[] = { 
	{	PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,

		PCI_SUBVENDOR_ID_EXSYS,

		PCI_SUBDEVICE_ID_EXSYS_4055, 0, 0,

		pbn_exsys_4055 },

		pbn_b2_4_115200 },

	/*

	 * Megawolf Romulus PCI Serial Card, from Mike Hudson

	 * (Exoray@isys.ca)