From 817737f651e807e0104aa59e8f1b27676913e107 Mon Sep 17 00:00:00 2001
From: Till Harbaum <Till@Harbaum.org>
Date: Fri, 11 Apr 2008 12:07:05 +0200
Subject: [PATCH] --- yaml --- r: 88277 b: refs/heads/master c:
 fa16eefd3e835dd81c688a2a743eb59331162ed5 h: refs/heads/master i:   88275:
 06a842bda95837fef0d73fe01f59a6f200fb28d7 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/i2c/busses/i2c-tiny-usb.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e499fb54dd90..6f10cb5ad6f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b73a9aece56594bdb73712c8b9a8a4ad05fdeb33
+refs/heads/master: fa16eefd3e835dd81c688a2a743eb59331162ed5
diff --git a/trunk/drivers/i2c/busses/i2c-tiny-usb.c b/trunk/drivers/i2c/busses/i2c-tiny-usb.c
index cb9abe7565a7..b1c050ff311d 100644
--- a/trunk/drivers/i2c/busses/i2c-tiny-usb.c
+++ b/trunk/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);