diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-24 08:11:20 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-24 08:11:20 +0400 |
commit | 973e2abd15326114ff9a099d6dfe0ef6be6fc7e6 (patch) | |
tree | 06ef7573e06500a4999a755006eb9a95bdf85ffa /drivers/usb/serial/ftdi_sio_ids.h | |
parent | 5676005acf26ab7e924a8438ea4746e47d405762 (diff) | |
parent | 016af59f0f8cd10f27773df8f0034b5f3b46a138 (diff) | |
download | linux-973e2abd15326114ff9a099d6dfe0ef6be6fc7e6.tar.xz |
Merge remote-tracking branch 'mpe/master' into next
Merge the tentative powerpc-next branch maintained by Michael
while I was on vacation
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 9d359e189a64..e79861eeed4c 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -584,6 +584,13 @@ #define CONTEC_COM1USBH_PID 0x8311 /* COM-1(USB)H */ /* + * Mitsubishi Electric Corp. (http://www.meau.com) + * Submitted by Konstantin Holoborodko + */ +#define MITSUBISHI_VID 0x06D3 +#define MITSUBISHI_FXUSB_PID 0x0284 /* USB/RS422 converters: FX-USB-AW/-BD */ + +/* * Definitions for B&B Electronics products. */ #define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */ |