summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.h
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-04 06:40:40 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-04 06:40:40 +0200
commitae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch)
tree9d3cedeb65db521a8436b545bd91641549a18d24 /drivers/usb/serial/ftdi_sio.h
parent[libata sata_promise] pdc20619 (PATA) support (diff)
parent[PATCH] prom_find_machine_type typo breaks pSeries lpar boot (diff)
downloadlinux-ae20ea8525a80a863f70d332cf47b71bd9f54c1f.tar.xz
linux-ae20ea8525a80a863f70d332cf47b71bd9f54c1f.zip
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
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 a52bb13a9ce4..8866376823a5 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