[-mm PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx
The #define CONFIG_DVB_* are actually CFLAGS set by Makefile.
CONFIG_* namespace is reserved for Kconfig. This renames them back to HAVE_*
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
linux/drivers/media/video/cx88/Makefile |8 ++--
linux/drivers/media/video/cx88/cx88-dvb.c | 26
linux/drivers/media/video/saa7134/Makefile |4 +-
linux/drivers/media/video/saa7134/saa7134-dvb.c | 16 -
4 files changed, 27 insertions(+), 27 deletions(-)
diff -u linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c
linux/drivers/media/video/cx88/cx88-dvb.c
--- linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c2005-07-24
17:59:15.0 +
+++ linux/drivers/media/video/cx88/cx88-dvb.c 2005-07-24 18:21:52.0
+
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-dvb.c,v 1.51 2005/07/24 19:09:28 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.52 2005/07/24 22:12:47 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -35,17 +35,17 @@
#include "cx88.h"
#include "dvb-pll.h"
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
# include "mt352.h"
# include "mt352_priv.h"
#endif
-#ifdef CONFIG_DVB_CX22702
+#ifdef HAVE_CX22702
# include "cx22702.h"
#endif
-#ifdef CONFIG_DVB_OR51132
+#ifdef HAVE_OR51132
# include "or51132.h"
#endif
-#ifdef CONFIG_DVB_LGDT3302
+#ifdef HAVE_LGDT3302
# include "lgdt3302.h"
#endif
@@ -104,7 +104,7 @@
/* -- */
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
{
static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 };
@@ -174,7 +174,7 @@
};
#endif
-#ifdef CONFIG_DVB_CX22702
+#ifdef HAVE_CX22702
static struct cx22702_config connexant_refboard_config = {
.demod_address = 0x43,
.output_mode = CX22702_SERIAL_OUTPUT,
@@ -190,7 +190,7 @@
};
#endif
-#ifdef CONFIG_DVB_OR51132
+#ifdef HAVE_OR51132
static int or51132_set_ts_param(struct dvb_frontend* fe,
int is_punctured)
{
@@ -207,7 +207,7 @@
};
#endif
-#ifdef CONFIG_DVB_LGDT3302
+#ifdef HAVE_LGDT3302
static int lgdt3302_pll_set(struct dvb_frontend* fe,
struct dvb_frontend_parameters* params,
u8* pllbuf)
@@ -258,7 +258,7 @@
/* init frontend */
switch (dev->core->board) {
-#ifdef CONFIG_DVB_CX22702
+#ifdef HAVE_CX22702
case CX88_BOARD_HAUPPAUGE_DVB_T1:
dev->dvb.frontend = cx22702_attach(_novat_config,
>core->i2c_adap);
@@ -269,7 +269,7 @@
>core->i2c_adap);
break;
#endif
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
dev->core->pll_addr = 0x61;
dev->core->pll_desc = _pll_lg_z201;
@@ -291,13 +291,13 @@
>core->i2c_adap);
break;
#endif
-#ifdef CONFIG_DVB_OR51132
+#ifdef HAVE_OR51132
case CX88_BOARD_PCHDTV_HD3000:
dev->dvb.frontend = or51132_attach(_hd3000,
>core->i2c_adap);
break;
#endif
-#ifdef CONFIG_DVB_LGDT3302
+#ifdef HAVE_LGDT3302
case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
dev->ts_gen_cntrl = 0x08;
{
diff -u linux-2.6.13/drivers/media/video/saa7134/saa7134-dvb.c
linux/drivers/media/video/saa7134/saa7134-dvb.c
--- linux-2.6.13/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-24
17:56:27.0 +
+++ linux/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-24
18:21:52.0 +
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-dvb.c,v 1.22 2005/07/23 10:08:00 mkrufky Exp $
+ * $Id: saa7134-dvb.c,v 1.23 2005/07/24 22:12:47 mkrufky Exp $
*
* (c) 2004 Gerd Knorr <[EMAIL PROTECTED]> [SuSE Labs]
*
@@ -35,11 +35,11 @@
#include "saa7134-reg.h"
#include "saa7134.h"
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
# include "mt352.h"
# include "mt352_priv.h" /* FIXME */
#endif
-#ifdef CONFIG_DVB_TDA1004X
+#ifdef HAVE_TDA1004X
# include "tda1004x.h"
#endif
@@ -53,7 +53,7 @@
/* -- */
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on)
{
u32 ok;
@@ -152,7 +152,7 @@
/* -- */
-#ifdef CONFIG_DVB_TDA1004X
+#ifdef HAVE_TDA1004X
static int philips_tu1216_pll_init(struct dvb_frontend *fe)
{
struct saa7134_dev *dev = fe->dvb->priv;
@@ -384,7 +384,7 @@
return 0;
}
-#ifdef CONFIG_DVB_TDA1004X
+#ifdef HAVE_TDA1004X
static struct tda1004x_config medion_cardbus = {
.demod_address = 0x08,
.invert= 1,
@@ -547,14 +547,14
[-mm PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx
The #define CONFIG_DVB_* are actually CFLAGS set by Makefile.
CONFIG_* namespace is reserved for Kconfig. This renames them back to HAVE_*
Signed-off-by: Michael Krufky [EMAIL PROTECTED]
linux/drivers/media/video/cx88/Makefile |8 ++--
linux/drivers/media/video/cx88/cx88-dvb.c | 26
linux/drivers/media/video/saa7134/Makefile |4 +-
linux/drivers/media/video/saa7134/saa7134-dvb.c | 16 -
4 files changed, 27 insertions(+), 27 deletions(-)
diff -u linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c
linux/drivers/media/video/cx88/cx88-dvb.c
--- linux-2.6.13/drivers/media/video/cx88/cx88-dvb.c2005-07-24
17:59:15.0 +
+++ linux/drivers/media/video/cx88/cx88-dvb.c 2005-07-24 18:21:52.0
+
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-dvb.c,v 1.51 2005/07/24 19:09:28 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.52 2005/07/24 22:12:47 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -35,17 +35,17 @@
#include cx88.h
#include dvb-pll.h
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
# include mt352.h
# include mt352_priv.h
#endif
-#ifdef CONFIG_DVB_CX22702
+#ifdef HAVE_CX22702
# include cx22702.h
#endif
-#ifdef CONFIG_DVB_OR51132
+#ifdef HAVE_OR51132
# include or51132.h
#endif
-#ifdef CONFIG_DVB_LGDT3302
+#ifdef HAVE_LGDT3302
# include lgdt3302.h
#endif
@@ -104,7 +104,7 @@
/* -- */
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
{
static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 };
@@ -174,7 +174,7 @@
};
#endif
-#ifdef CONFIG_DVB_CX22702
+#ifdef HAVE_CX22702
static struct cx22702_config connexant_refboard_config = {
.demod_address = 0x43,
.output_mode = CX22702_SERIAL_OUTPUT,
@@ -190,7 +190,7 @@
};
#endif
-#ifdef CONFIG_DVB_OR51132
+#ifdef HAVE_OR51132
static int or51132_set_ts_param(struct dvb_frontend* fe,
int is_punctured)
{
@@ -207,7 +207,7 @@
};
#endif
-#ifdef CONFIG_DVB_LGDT3302
+#ifdef HAVE_LGDT3302
static int lgdt3302_pll_set(struct dvb_frontend* fe,
struct dvb_frontend_parameters* params,
u8* pllbuf)
@@ -258,7 +258,7 @@
/* init frontend */
switch (dev-core-board) {
-#ifdef CONFIG_DVB_CX22702
+#ifdef HAVE_CX22702
case CX88_BOARD_HAUPPAUGE_DVB_T1:
dev-dvb.frontend = cx22702_attach(hauppauge_novat_config,
dev-core-i2c_adap);
@@ -269,7 +269,7 @@
dev-core-i2c_adap);
break;
#endif
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
dev-core-pll_addr = 0x61;
dev-core-pll_desc = dvb_pll_lg_z201;
@@ -291,13 +291,13 @@
dev-core-i2c_adap);
break;
#endif
-#ifdef CONFIG_DVB_OR51132
+#ifdef HAVE_OR51132
case CX88_BOARD_PCHDTV_HD3000:
dev-dvb.frontend = or51132_attach(pchdtv_hd3000,
dev-core-i2c_adap);
break;
#endif
-#ifdef CONFIG_DVB_LGDT3302
+#ifdef HAVE_LGDT3302
case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
dev-ts_gen_cntrl = 0x08;
{
diff -u linux-2.6.13/drivers/media/video/saa7134/saa7134-dvb.c
linux/drivers/media/video/saa7134/saa7134-dvb.c
--- linux-2.6.13/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-24
17:56:27.0 +
+++ linux/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-24
18:21:52.0 +
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-dvb.c,v 1.22 2005/07/23 10:08:00 mkrufky Exp $
+ * $Id: saa7134-dvb.c,v 1.23 2005/07/24 22:12:47 mkrufky Exp $
*
* (c) 2004 Gerd Knorr [EMAIL PROTECTED] [SuSE Labs]
*
@@ -35,11 +35,11 @@
#include saa7134-reg.h
#include saa7134.h
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
# include mt352.h
# include mt352_priv.h /* FIXME */
#endif
-#ifdef CONFIG_DVB_TDA1004X
+#ifdef HAVE_TDA1004X
# include tda1004x.h
#endif
@@ -53,7 +53,7 @@
/* -- */
-#ifdef CONFIG_DVB_MT352
+#ifdef HAVE_MT352
static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on)
{
u32 ok;
@@ -152,7 +152,7 @@
/* -- */
-#ifdef CONFIG_DVB_TDA1004X
+#ifdef HAVE_TDA1004X
static int philips_tu1216_pll_init(struct dvb_frontend *fe)
{
struct saa7134_dev *dev = fe-dvb-priv;
@@ -384,7 +384,7 @@
return 0;
}
-#ifdef CONFIG_DVB_TDA1004X
+#ifdef HAVE_TDA1004X
static struct tda1004x_config medion_cardbus = {
.demod_address = 0x08,
.invert= 1,
@@ -547,14 +547,14 @@
