Merge commit 'v2.6.27' into timers/hpet

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-tiny-usb.c

diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c
index cb9abe7565a7106cf3155322a2a3061522a12b0a..b1c050ff311ddd22beb0034e9d3bab325cedd687 100644 (file)
--- a/drivers/i2c/busses/i2c-tiny-usb.c
+++ b/drivers/i2c/busses/i2c-tiny-usb.c
@@ -131,11 +131,15 @@ static const struct i2c_algorithm usb_algorithm = {
 
 /* ----- begin of usb layer ---------------------------------------------- */
 
-/* The usb i2c interface uses a vid/pid pair donated by */
-/* Future Technology Devices International Ltd. */
+/*
+ * Initially the usb i2c interface uses a vid/pid pair donated by
+ * Future Technology Devices International Ltd., later a pair was
+ * bought from EZPrototypes
+ */
 static struct usb_device_id i2c_tiny_usb_table [] = {
-       { USB_DEVICE(0x0403, 0xc631) },
-       { }                     /* Terminating entry */
+       { USB_DEVICE(0x0403, 0xc631) },   /* FTDI */
+       { USB_DEVICE(0x1c40, 0x0534) },   /* EZPrototypes */
+       { }                               /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table);