diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 12:14:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 12:14:19 -0700 |
commit | 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b (patch) | |
tree | 59f1f4d3712ce3658f7540704d64c8d8ad6d4635 /drivers/usb/serial/ftdi_sio.h | |
parent | 1a2acc9e9214699a99389e323e6686e9e0e2ca67 (diff) | |
parent | df3fccb14ad02c5fabe095a104a0323c223f2833 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
[PATCH] USB: fix omninet driver bug
[PATCH] USB: add ark3116 usb to serial driver
[PATCH] usbserial: Fixes leak in serial_open() error path.
[PATCH] usbserial: Fixes use-after-free in serial_open().
[PATCH] USB: Emagic USB firmware loading fixes
[PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist
[PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c
[PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface
[PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader
[PATCH] USB: ub oops in block_uevent
[PATCH] USB: usbcore: don't check the device's power source
[PATCH] USB: fix OHCI PM regression
[PATCH] USB: pegasus fixes (logstorm, suspend)
[PATCH] USBATM: fix modinfo output
[PATCH] USBATM: change the default speedtouch iso altsetting
[PATCH] USB: fix bug in ohci-hcd.c ohci_restart()
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 2c55a5ea9c9..d69a917e768 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -32,6 +32,10 @@ #define FTDI_NF_RIC_PID 0x0001 /* Product Id */ +/* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */ +#define FTDI_ACTZWAVE_PID 0xF2D0 + + /* www.irtrans.de device */ #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */ @@ -426,6 +430,11 @@ #define PAPOUCH_VID 0x5050 /* Vendor ID */ #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */ +/* + * ACG Identification Technologies GmbH products (http://www.acg.de/). + * Submitted by anton -at- goto10 -dot- org. + */ +#define FTDI_ACG_HFDUAL_PID 0xDD20 /* HF Dual ISO Reader (RFID) */ /* Commands */ #define FTDI_SIO_RESET 0 /* Reset the port */ |