From eaa807e084a2f8c558d7dd4fab2d3601f1ba7ed4 Mon Sep 17 00:00:00 2001 From: Bruno Thomsen Date: Sun, 4 Mar 2012 15:19:14 +0100 Subject: [PATCH] --- yaml --- r: 289653 b: refs/heads/master c: c1cee1d84001815a1b4321c49b995254c0df3100 h: refs/heads/master i: 289651: 2906942ed735164593b9c3c71589bb70fc609bf1 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 2 +- trunk/drivers/usb/serial/ftdi_sio_ids.h | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b2d366d8bce9..62b1a0936e53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88555a63caafcc86b93b045dfc26cd7a8fa16350 +refs/heads/master: c1cee1d84001815a1b4321c49b995254c0df3100 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index b160c252bf13..d8130993a922 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -801,7 +801,7 @@ static struct usb_device_id id_table_combined [] = { .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) }, + { USB_DEVICE(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID) }, { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, diff --git a/trunk/drivers/usb/serial/ftdi_sio_ids.h b/trunk/drivers/usb/serial/ftdi_sio_ids.h index ed74019c5b46..2a87965b7723 100644 --- a/trunk/drivers/usb/serial/ftdi_sio_ids.h +++ b/trunk/drivers/usb/serial/ftdi_sio_ids.h @@ -532,10 +532,14 @@ #define ADI_GNICEPLUS_PID 0xF001 /* - * Hornby Elite + * Microchip Technology, Inc. + * + * MICROCHIP_VID (0x04D8) and MICROCHIP_USB_BOARD_PID (0x000A) are also used by: + * Hornby Elite - Digital Command Control Console + * http://www.hornby.com/hornby-dcc/controllers/ */ -#define HORNBY_VID 0x04D8 -#define HORNBY_ELITE_PID 0x000A +#define MICROCHIP_VID 0x04D8 +#define MICROCHIP_USB_BOARD_PID 0x000A /* CDC RS-232 Emulation Demo */ /* * RATOC REX-USB60F