From 4f9cbcc6f3f0f86bd69c42d69d58ce0e3113f55b Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <devin.heitmueller@gmail.com>
Date: Tue, 16 Sep 2008 02:02:12 -0300
Subject: [PATCH] --- yaml --- r: 110195 b: refs/heads/master c:
 5ea7fe48a95084897786b0f20109d0611bdababc h: refs/heads/master i:   110193:
 8279eb80e73f6dab6f7b505965596224cbb714b3   110191:
 50bb0bc348f18709440cdee12b768a146ebbc7a7 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/common/tuners/tuner-xc2028.h | 1 +
 trunk/drivers/media/video/em28xx/em28xx-cards.c  | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index adac9ad69c0f..8715d0171742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1c4530e4e5b73e60ed96c413902c6a46e812494
+refs/heads/master: 5ea7fe48a95084897786b0f20109d0611bdababc
diff --git a/trunk/drivers/media/common/tuners/tuner-xc2028.h b/trunk/drivers/media/common/tuners/tuner-xc2028.h
index 216025cf5d4b..2c5b6282b569 100644
--- a/trunk/drivers/media/common/tuners/tuner-xc2028.h
+++ b/trunk/drivers/media/common/tuners/tuner-xc2028.h
@@ -10,6 +10,7 @@
 #include "dvb_frontend.h"
 
 #define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw"
+#define XC3028L_DEFAULT_FIRMWARE "xc3028L-v36.fw"
 
 /*      Dmoduler		IF (kHz) */
 #define	XC3028_FE_DEFAULT	0		/* Don't load SCODE */
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 4d20cda7a1fa..c7456e976655 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1530,9 +1530,12 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
 		/* djh - Not sure which demod we need here */
 		ctl->demod = XC3028_FE_DEFAULT;
 		break;
+	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
+		ctl->demod = XC3028_FE_DEFAULT;
+		ctl->fname = XC3028L_DEFAULT_FIRMWARE;
+		break;
 	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
 	case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:
-	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
 		/* FIXME: Better to specify the needed IF */
 		ctl->demod = XC3028_FE_DEFAULT;
 		break;