From 3eb72aba6390fa01e4661f7e2687402b77f04939 Mon Sep 17 00:00:00 2001
From: Jesse Sung <jsung@novell.com>
Date: Fri, 20 Feb 2009 21:13:45 -0800
Subject: [PATCH] --- yaml --- r: 131877 b: refs/heads/master c:
 28fb66821f884870987a0b5ab064ef651d9f7c16 h: refs/heads/master i:   131875:
 67a8dd3c564a654fddac1e57c63bfdfab39fd12b v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/serial/option.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eb34702a9788..5b0ff3a43a3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29a46bf6f4f57df22f91573bb482a24237741347
+refs/heads/master: 28fb66821f884870987a0b5ab064ef651d9f7c16
diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c
index bfd0b68ceccd..c454b52ede3e 100644
--- a/trunk/drivers/usb/serial/option.c
+++ b/trunk/drivers/usb/serial/option.c
@@ -296,6 +296,9 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define ERICSSON_VENDOR_ID			0x0bdb
 #define ERICSSON_PRODUCT_F3507G			0x1900
 
+#define BENQ_VENDOR_ID				0x04a5
+#define BENQ_PRODUCT_H10			0x4068
+
 static struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -510,6 +513,8 @@ static struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
 	{ USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) },
+	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
+	{ USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);