From 51c9f915ea82cdbc9533a22efed8b0e969a215ed Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu@gmail.com>
Date: Fri, 4 Dec 2009 04:47:30 -0300
Subject: [PATCH] --- yaml --- r: 179464 b: refs/heads/master c:
 35afca912ffb8ea5a060ff53a59266ccaa769c98 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/dvb/mantis/mantis_core.c   | 1 +
 trunk/drivers/media/dvb/mantis/mantis_dvb.c    | 1 +
 trunk/drivers/media/dvb/mantis/mantis_vp1041.h | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7583792ef87..51286cd8cf5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0131258ba7a5f776627da953b4cef775568026ea
+refs/heads/master: 35afca912ffb8ea5a060ff53a59266ccaa769c98
diff --git a/trunk/drivers/media/dvb/mantis/mantis_core.c b/trunk/drivers/media/dvb/mantis/mantis_core.c
index 47cfb759f0bd..a164bb143631 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_core.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_core.c
@@ -113,6 +113,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
 		mantis->hwconfig = &vp1034_mantis_config;
 		break;
 	case MANTIS_VP_1041_DVB_S2:	// VP-1041
+	case TECHNISAT_SKYSTAR_HD2:
 		mantis->hwconfig = &vp1041_mantis_config;
 		break;
 	case MANTIS_VP_2033_DVB_C:	// VP-2033
diff --git a/trunk/drivers/media/dvb/mantis/mantis_dvb.c b/trunk/drivers/media/dvb/mantis/mantis_dvb.c
index a4750bb22b02..9634b972a0f9 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_dvb.c
@@ -240,6 +240,7 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis)
 		}
 		break;
 	case MANTIS_VP_1041_DVB_S2:
+	case TECHNISAT_SKYSTAR_HD2:
 		mantis->fe = stb0899_attach(&vp1041_config, &mantis->adapter);
 		if (mantis->fe) {
 			dprintk(verbose, MANTIS_ERROR, 1,
diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp1041.h b/trunk/drivers/media/dvb/mantis/mantis_vp1041.h
index 53f4cb188572..2cc83a6e5996 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_vp1041.h
+++ b/trunk/drivers/media/dvb/mantis/mantis_vp1041.h
@@ -28,6 +28,7 @@
 #include "lnbp21.h"
 
 #define MANTIS_VP_1041_DVB_S2	0x0031
+#define TECHNISAT_SKYSTAR_HD2	0x0001
 
 extern struct mantis_hwconfig vp1041_mantis_config;
 extern struct stb0899_config vp1041_config;