From 7b3acac79e65f876411b8a8190a818dd585a25ed Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhen78@gmail.com>
Date: Sun, 5 Jul 2009 10:51:21 -0300
Subject: [PATCH] --- yaml --- r: 161423 b: refs/heads/master c:
 7c8b56795fdf59761ee3475b6add2fd4b635d2b6 h: refs/heads/master i:   161421:
 8a60f19eecbfe9a090889ac9478d8ca3550d56d1   161419:
 99515dbc2d4a16936d62dcf71d36ea715decab05   161415:
 7834003b475f22f66a115bb0d21dbe87cc4c4358   161407:
 b7d802bfcaee934c6a9c2ce31027a00802368b6b v: v3

---
 [refs]                                          | 2 +-
 trunk/Documentation/video4linux/CARDLIST.em28xx | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 553f49459fb7..0fec5f88a683 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bdf1377587bbde8ef0893cf726de116c2250208
+refs/heads/master: 7c8b56795fdf59761ee3475b6add2fd4b635d2b6
diff --git a/trunk/Documentation/video4linux/CARDLIST.em28xx b/trunk/Documentation/video4linux/CARDLIST.em28xx
index e352d754875c..66e5f829577c 100644
--- a/trunk/Documentation/video4linux/CARDLIST.em28xx
+++ b/trunk/Documentation/video4linux/CARDLIST.em28xx
@@ -33,7 +33,7 @@
  34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]
  35 -> Typhoon DVD Maker                        (em2860)
  36 -> NetGMBH Cam                              (em2860)
- 37 -> Gadmei UTV330                            (em2860)
+ 37 -> Gadmei UTV330                            (em2860)        [eb1a:50a6]
  38 -> Yakumo MovieMixer                        (em2861)
  39 -> KWorld PVRTV 300U                        (em2861)        [eb1a:e300]
  40 -> Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 1c2e544eda73..22a464f5007b 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1649,6 +1649,8 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2861_BOARD_PLEXTOR_PX_TV100U },
 	{ USB_DEVICE(0x04bb, 0x0515),
 			.driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
+	{ USB_DEVICE(0xeb1a, 0x50a6),
+			.driver_info = EM2860_BOARD_GADMEI_UTV330 },
 	{ },
 };
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);