fix compile of cx88-dvb for lgdt330x in 2.6.13

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

4 files changed, 9 insertions, 72 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 31d1a5310..a2e542a52 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.60 2005/08/17 19:42:11 nsh Exp $
+ * $Id: cx88-dvb.c,v 1.61 2005/08/19 15:55:16 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -216,7 +216,6 @@ static struct or51132_config pchdtv_hd3000 = {
 #endif
 
 #ifdef HAVE_LGDT330X
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int lgdt330x_pll_set(struct dvb_frontend* fe,
 			    struct dvb_frontend_parameters* params)
 {
@@ -257,18 +256,6 @@ static int lgdt330x_pll_set(struct dvb_frontend* fe,
 	}
 	return 0;
 }
-#else
-static int lgdt330x_pll_set(struct dvb_frontend* fe,
-			    struct dvb_frontend_parameters* params, u8* pllbuf)
-{
-	struct cx8802_dev *dev= fe->dvb->priv;
-
-	pllbuf[0] = dev->core->pll_addr;
-	dvb_pll_configure(dev->core->pll_desc, &pllbuf[1],
-			  params->frequency, 0);
-	return 0;
-}
-#endif
 
 static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)
 {
@@ -295,7 +282,6 @@ static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
 
 static struct lgdt330x_config fusionhdtv_3_gold = {
 	.demod_address    = 0x0e,
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	.demod_chip       = LGDT3302,
 	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
 	.pll_set          = lgdt330x_pll_set,
@@ -306,7 +292,6 @@ static struct lgdt330x_config fusionhdtv_5_gold = {
 	.demod_address    = 0x0e,
 	.demod_chip       = LGDT3303,
 	.serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
-#endif
 	.pll_set          = lgdt330x_pll_set,
 	.set_ts_params    = lgdt330x_set_ts_param,
 };
@@ -395,7 +380,6 @@ static int dvb_register(struct cx8802_dev *dev)
 						    &dev->core->i2c_adap);
 		}
 		break;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
 		dev->ts_gen_cntrl = 0x08;
 		{
@@ -413,7 +397,6 @@ static int dvb_register(struct cx8802_dev *dev)
 		}
 		break;
 #endif
-#endif
 	default:
 		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
 		       dev->core->name);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index b015a78f2..71973b59a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-19 15:48 mkrufky
+
+	* cx88-dvb.c:
+	* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
+	- fix compile of cx88-dvb for lgdt330x in 2.6.13
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-08-18 00:00 catalin
 
 	* cx88-blackbird.c:
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 35de4e76e..1d573b30b 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -70,33 +70,6 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
  #include "cx88.h"
  #include "dvb-pll.h"
  
-@@ -216,7 +212,7 @@ static struct or51132_config pchdtv_hd30
- #endif
- 
- #ifdef HAVE_LGDT330X
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-+#if 1
- static int lgdt330x_pll_set(struct dvb_frontend* fe,
- 			    struct dvb_frontend_parameters* params)
- {
-@@ -298,7 +294,7 @@ static int lgdt330x_set_ts_param(struct 
- 
- static struct lgdt330x_config fusionhdtv_3_gold = {
- 	.demod_address    = 0x0e,
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-+#if 1
- 	.demod_chip       = LGDT3302,
- 	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
- 	.pll_set          = lgdt330x_pll_set,
-@@ -398,7 +394,7 @@ static int dvb_register(struct cx8802_de
- 						    &dev->core->i2c_adap);
- 		}
- 		break;
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-+#if 1
- 	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
- 		dev->ts_gen_cntrl = 0x08;
- 		{
 diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
 --- video4linux.orig/saa7134-dvb.c	2005-08-17 00:48:25.000000000 +0000
 +++ video4linux/saa7134-dvb.c	2005-08-17 00:49:02.000000000 +0000
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 78ae50c7d..8b2d5b2a9 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -70,33 +70,6 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c
  #include "cx88.h"
  #include "dvb-pll.h"
  
-@@ -212,7 +216,7 @@ static struct or51132_config pchdtv_hd30
- #endif
- 
- #ifdef HAVE_LGDT330X
--#if 1
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
- static int lgdt330x_pll_set(struct dvb_frontend* fe,
- 			    struct dvb_frontend_parameters* params)
- {
-@@ -294,7 +298,7 @@ static int lgdt330x_set_ts_param(struct 
- 
- static struct lgdt330x_config fusionhdtv_3_gold = {
- 	.demod_address    = 0x0e,
--#if 1
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
- 	.demod_chip       = LGDT3302,
- 	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
- 	.pll_set          = lgdt330x_pll_set,
-@@ -394,7 +398,7 @@ static int dvb_register(struct cx8802_de
- 						    &dev->core->i2c_adap);
- 		}
- 		break;
--#if 1
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
- 	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
- 		dev->ts_gen_cntrl = 0x08;
- 		{
 diff -upr video4linux/saa7134-dvb.c video4linux.orig/saa7134-dvb.c
 --- video4linux/saa7134-dvb.c	2005-08-17 00:49:02.000000000 +0000
 +++ video4linux.orig/saa7134-dvb.c	2005-08-17 00:48:25.000000000 +0000