From 0e8a1ecffe8c86a59c0490daac98c5d1d2e3ba7b Mon Sep 17 00:00:00 2001
From: Oliver Endriss <o.endriss@gmx.de>
Date: Wed, 3 Feb 2010 13:57:58 -0300
Subject: [PATCH] --- yaml --- r: 181653 b: refs/heads/master c:
 e890e7c0426ab99b032d5b387b1ca9fad6928895 h: refs/heads/master i:   181651:
 c52ee9def1dda20cf2d911f5542faf0bb4c0af71 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/dvb/ngene/ngene-core.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 9ef03ae80259..ea2f18f05153 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ace30f74ac1b3f20ab8f98995510a5e0d643c42c
+refs/heads/master: e890e7c0426ab99b032d5b387b1ca9fad6928895
diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c
index 389204b7df11..1bb9bc78573e 100644
--- a/trunk/drivers/media/dvb/ngene/ngene-core.c
+++ b/trunk/drivers/media/dvb/ngene/ngene-core.c
@@ -1879,7 +1879,7 @@ static int __devinit ngene_probe(struct pci_dev *pci_dev,
 /* Card configs *************************************************************/
 /****************************************************************************/
 
-static struct stv090x_config fe_mps2 = {
+static struct stv090x_config fe_cineS2 = {
 	.device         = STV0900,
 	.demod_mode     = STV090x_DUAL,
 	.clk_mode       = STV090x_CLK_EXT,
@@ -1898,26 +1898,26 @@ static struct stv090x_config fe_mps2 = {
 	.diseqc_envelope_mode = true,
 };
 
-static struct stv6110x_config tuner_mps2_0 = {
+static struct stv6110x_config tuner_cineS2_0 = {
 	.addr	= 0x60,
 	.refclk	= 27000000,
 	.clk_div = 1,
 };
 
-static struct stv6110x_config tuner_mps2_1 = {
+static struct stv6110x_config tuner_cineS2_1 = {
 	.addr	= 0x63,
 	.refclk	= 27000000,
 	.clk_div = 1,
 };
 
-static struct ngene_info ngene_info_mps2 = {
+static struct ngene_info ngene_info_cineS2 = {
 	.type		= NGENE_SIDEWINDER,
-	.name		= "Media-Pointer MP-S2/CineS2 DVB-S2 Twin Tuner",
+	.name		= "Linux4Media cineS2 DVB-S2 Twin Tuner",
 	.io_type	= {NGENE_IO_TSIN, NGENE_IO_TSIN},
 	.demod_attach	= {demod_attach_stv0900, demod_attach_stv0900},
 	.tuner_attach	= {tuner_attach_stv6110, tuner_attach_stv6110},
-	.fe_config	= {&fe_mps2, &fe_mps2},
-	.tuner_config	= {&tuner_mps2_0, &tuner_mps2_1},
+	.fe_config	= {&fe_cineS2, &fe_cineS2},
+	.tuner_config	= {&tuner_cineS2_0, &tuner_cineS2_1},
 	.lnb		= {0x0b, 0x08},
 	.tsf		= {3, 3},
 	.fw_version	= 15,
@@ -1929,8 +1929,8 @@ static struct ngene_info ngene_info_satixs2 = {
 	.io_type	= {NGENE_IO_TSIN, NGENE_IO_TSIN},
 	.demod_attach	= {demod_attach_stv0900, demod_attach_stv0900},
 	.tuner_attach	= {tuner_attach_stv6110, tuner_attach_stv6110},
-	.fe_config	= {&fe_mps2, &fe_mps2},
-	.tuner_config	= {&tuner_mps2_0, &tuner_mps2_1},
+	.fe_config	= {&fe_cineS2, &fe_cineS2},
+	.tuner_config	= {&tuner_cineS2_0, &tuner_cineS2_1},
 	.lnb		= {0x0b, 0x08},
 	.tsf		= {3, 3},
 	.fw_version	= 15,
@@ -1952,8 +1952,8 @@ static struct ngene_info ngene_info_satixs2 = {
 /****************************************************************************/
 
 static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
-	NGENE_ID(0x18c3, 0xabc3, ngene_info_mps2),
-	NGENE_ID(0x18c3, 0xabc4, ngene_info_mps2),
+	NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
+	NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
 	NGENE_ID(0x18c3, 0xdb01, ngene_info_satixs2),
 	{0}
 };