From 33c07d831778ae3d837038d3560707df4b951f2d Mon Sep 17 00:00:00 2001
From: "Igor M. Liplianin" <liplianin@me.by>
Date: Wed, 9 May 2012 07:23:14 -0300
Subject: [PATCH] --- yaml --- r: 330731 b: refs/heads/master c:
 9fa4d6a102ebb06663a03554b57fb93ad618b72e h: refs/heads/master i:   330729:
 973c15daa36cbdb860f842ebe179bce1244846a1   330727:
 e9e41fad7c362e401e6e89c2340aae631365f122 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/dvb/mantis/mantis_cards.c | 2 +-
 trunk/drivers/media/dvb/mantis/mantis_core.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7aacb2ef8fc0..fcf9b92e2937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de5bffddbf5fa9d04f3d181dadcaedc1efa0158
+refs/heads/master: 9fa4d6a102ebb06663a03554b57fb93ad618b72e
diff --git a/trunk/drivers/media/dvb/mantis/mantis_cards.c b/trunk/drivers/media/dvb/mantis/mantis_cards.c
index 095cf3a994e2..0207d1f064e0 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_cards.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_cards.c
@@ -275,7 +275,7 @@ static struct pci_device_id mantis_pci_table[] = {
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
 	MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
-	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
+	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
 	{ }
 };
diff --git a/trunk/drivers/media/dvb/mantis/mantis_core.c b/trunk/drivers/media/dvb/mantis/mantis_core.c
index 22524a8e6f61..684d9061fe2a 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_core.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_core.c
@@ -121,7 +121,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
 		mantis->hwconfig = &vp2033_mantis_config;
 		break;
 	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
-	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
+	case CINERGY_C:	/* VP-2040 clone */
 	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;