summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-08 15:45:45 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-08 15:45:45 +0100
commit364f6c717deef4a3ac4982e670fa9846b43cd060 (patch)
tree47e3967d6e2220130f2c070e300c97709143b28f /drivers/usb/serial/ftdi_sio.h
parent4ff4258a3e558814a3d48c50a59cd22f56bbea2f (diff)
parent1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 (diff)
downloadop-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.zip
op-kernel-dev-364f6c717deef4a3ac4982e670fa9846b43cd060.tar.gz
Automatic merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
-rw-r--r--drivers/usb/serial/ftdi_sio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index a52bb13..8866376 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -144,6 +144,8 @@
/* ELV USB Module UO100 (PID sent by Stefan Frings) */
#define FTDI_ELV_UO100_PID 0xFB58 /* Product Id */
+/* ELV USB Module UM100 (PID sent by Arnim Laeuger) */
+#define FTDI_ELV_UM100_PID 0xFB5A /* Product Id */
/*
* Definitions for ID TECH (www.idt-net.com) devices
OpenPOWER on IntegriCloud