From 9906675c3393468c1d697f2a97cc8b44f5badae9 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 27 Jul 2008 16:58:04 -0300
Subject: [PATCH] --- yaml --- r: 106783 b: refs/heads/master c:
 ee281b856d4e4921da24387ab116bb0855c2efaa h: refs/heads/master i:   106781:
 961e86b77cb110042780b1ae3b4d76a45068ecce   106779:
 df19ade20e23ab186f86428543fb7c6dd179b26b   106775:
 39acd9841362aee33c33da8e9c6c5c257a158ac9   106767:
 da5e462697bb00b35274546f40825fb1afe530cd   106751:
 2f25138e82065bbda097dce1b7913e5eb5d55d14 v: v3

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

diff --git a/[refs] b/[refs]
index 9d566156e680..81ad48018157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe43ef894c282dbfa963872eef577bab46a178fb
+refs/heads/master: ee281b856d4e4921da24387ab116bb0855c2efaa
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 6b241cc6c413..476ae44a62d2 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1091,7 +1091,7 @@ struct em28xx_board em28xx_boards[] = {
 			.amux     = 1,
 		} },
 	},
-	[EM2820_BOARD_COMPRO_VIDEO_MATE] = {
+	[EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {
 		.name         = "Compro VideoMate ForYou/Stereo",
 		.vchannels    = 2,
 		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,
@@ -1169,7 +1169,7 @@ struct usb_device_id em28xx_id_table [] = {
 	{ USB_DEVICE(0x185b, 0x2870),
 			.driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },
 	{ USB_DEVICE(0x185b, 0x2041),
-			.driver_info = EM2820_BOARD_COMPRO_VIDEO_MATE },
+			.driver_info = EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU },
 	{ USB_DEVICE(0x2040, 0x4200),
 			.driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
 	{ USB_DEVICE(0x2040, 0x4201),
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index dc2019a844ec..9a3310748685 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -96,7 +96,7 @@
 #define EM2882_BOARD_TERRATEC_HYBRID_XS		  55
 #define EM2882_BOARD_PINNACLE_HYBRID_PRO	  56
 #define EM2883_BOARD_KWORLD_HYBRID_A316		  57
-#define EM2820_BOARD_COMPRO_VIDEO_MATE		  58
+#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU	  58
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4