From 10d8b9695f263a53c5ea98eae4df2b56008f8c84 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Mon, 12 Jun 2006 14:06:22 -0300
Subject: [PATCH] --- yaml --- r: 30003 b: refs/heads/master c:
 c2af3cd68e0680a659166d0cecc24afb93b2000e h: refs/heads/master i:   30001:
 abb7a4284995d0f30c263d1f1383e09208b4a9e2   29999:
 24bc976365b2b74550a4f81f8f02bc5e57076697 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/cx88/cx88-dvb.c | 41 +++++++++++------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index b83fa61d98c1..d8d6b9800a9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66dd0fccbdbb77db897dd5870a67cb8022899adc
+refs/heads/master: c2af3cd68e0680a659166d0cecc24afb93b2000e
diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
index 7db9d4052625..f634041ac985 100644
--- a/trunk/drivers/media/video/cx88/cx88-dvb.c
+++ b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -560,6 +560,26 @@ static int dvb_register(struct cx8802_dev *dev)
 		if (dev->dvb.frontend != NULL) {
 			dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
 		}
+#endif
+		break;
+	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
+#ifdef HAVE_MT352
+		/* The tin box says DEE1601, but it seems to be DTT7579
+		 * compatible, with a slightly different MT352 AGC gain. */
+		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual,
+						 &dev->core->i2c_adap);
+		if (dev->dvb.frontend != NULL) {
+			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
+			break;
+		}
+#endif
+#ifdef HAVE_ZL10353
+		/* ZL10353 replaces MT352 on later cards */
+		dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,
+						   &dev->core->i2c_adap);
+		if (dev->dvb.frontend != NULL) {
+			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
+		}
 #endif
 		break;
 #endif /* HAVE_MT352 || HAVE_ZL10353 */
@@ -594,27 +614,6 @@ static int dvb_register(struct cx8802_dev *dev)
 #endif
 		break;
 #endif
-#if defined(HAVE_MT352) || defined(HAVE_ZL10353)
-	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
-#ifdef HAVE_MT352
-		/* The tin box says DEE1601, but it seems to be DTT7579
-		 * compatible, with a slightly different MT352 AGC gain. */
-		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual,
-						 &dev->core->i2c_adap);
-		if (dev->dvb.frontend != NULL) {
-			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
-			break;
-		}
-#endif
-#ifdef HAVE_ZL10353
-		/* ZL10353 replaces MT352 on later cards */
-		dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1, &dev->core->i2c_adap);
-		if (dev->dvb.frontend != NULL) {
-			dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
-		}
-#endif
-		break;
-#endif /* HAVE_MT352 || HAVE_ZL10353 */
 #ifdef HAVE_ZL10353
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
 		dev->core->pll_addr = 0x61;