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

Commit 9a49a14d authored by Daniel Sangorrin's avatar Daniel Sangorrin Committed by Greg Kroah-Hartman
Browse files

USB: serial: ftdi: correct merge conflict with CONTEC id 



This patch corrects a problem with the merge of a previous
patch to add the CONTEC identifier.

I believe the merge problem occurred with the commit:
dee5658b

Originally I submitted a patch and then they asked me to order the IDs
and resubmit, so did I. But unfortunately in the end somehow both
patches were merged.

Signed-off-by: default avatarDaniel Sangorrin <daniel.sangorrin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64d65872

drivers/usb/serial/ftdi_sio.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -653,7 +653,6 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) },

	{ USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -500,13 +500,6 @@ 
#define CONTEC_VID		0x06CE	/* Vendor ID */

#define CONTEC_VID		0x06CE	/* Vendor ID */

#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */

#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */





/*

 * Contec products (http://www.contec.com)

 * Submitted by Daniel Sangorrin

 */

#define CONTEC_VID		0x06CE	/* Vendor ID */

#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */



/*

/*

 * Definitions for B&B Electronics products.

 * Definitions for B&B Electronics products.

 */

 */