4 files changed, 15 insertions, 101 deletions

diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 352b919f30c4..639c3b659d0e 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -14,13 +14,6 @@ EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 
 extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
-extra-cflags-$(CONFIG_DVB_CX22702)   += -DHAVE_CX22702=1
-extra-cflags-$(CONFIG_DVB_OR51132)   += -DHAVE_OR51132=1
-extra-cflags-$(CONFIG_DVB_LGDT330X)  += -DHAVE_LGDT330X=1
-extra-cflags-$(CONFIG_DVB_MT352)     += -DHAVE_MT352=1
-extra-cflags-$(CONFIG_DVB_ZL10353)   += -DHAVE_ZL10353=1
-extra-cflags-$(CONFIG_DVB_NXT200X)   += -DHAVE_NXT200X=1
-extra-cflags-$(CONFIG_DVB_CX24123)   += -DHAVE_CX24123=1
 extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1
 
 EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 6afa3fba1f4f..81654954c338 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -33,32 +33,18 @@
 #include "dvb-pll.h"
 #include <media/v4l2-common.h>
 
-#ifdef HAVE_MT352
-# include "mt352.h"
-# include "mt352_priv.h"
-# ifdef HAVE_VP3054_I2C
-#  include "cx88-vp3054-i2c.h"
-# endif
-#endif
-#ifdef HAVE_ZL10353
-# include "zl10353.h"
-#endif
-#ifdef HAVE_CX22702
-# include "cx22702.h"
-#endif
-#ifdef HAVE_OR51132
-# include "or51132.h"
-#endif
-#ifdef HAVE_LGDT330X
-# include "lgdt330x.h"
-# include "lg_h06xf.h"
-#endif
-#ifdef HAVE_NXT200X
-# include "nxt200x.h"
-#endif
-#ifdef HAVE_CX24123
-# include "cx24123.h"
+#include "mt352.h"
+#include "mt352_priv.h"
+#ifdef HAVE_VP3054_I2C
+# include "cx88-vp3054-i2c.h"
 #endif
+#include "zl10353.h"
+#include "cx22702.h"
+#include "or51132.h"
+#include "lgdt330x.h"
+#include "lg_h06xf.h"
+#include "nxt200x.h"
+#include "cx24123.h"
 #include "isl6421.h"
 
 MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
@@ -114,8 +100,6 @@ static struct videobuf_queue_ops dvb_qops = {
 };
 
 /* ------------------------------------------------------------------ */
-
-#ifdef HAVE_MT352
 static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x39 };
@@ -283,9 +267,7 @@ static struct mt352_config dntv_live_dvbt_pro_config = {
         .demod_init    = dntv_live_dvbt_pro_demod_init,
 };
 #endif
-#endif
 
-#ifdef HAVE_ZL10353
 static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
                                          struct dvb_frontend_parameters *params)
 {
@@ -323,9 +305,7 @@ static struct zl10353_config dvico_fusionhdtv_hybrid = {
 static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {
         .demod_address = 0x0F,
 };
-#endif
 
-#ifdef HAVE_CX22702
 static struct cx22702_config connexant_refboard_config = {
         .demod_address = 0x43,
         .output_mode   = CX22702_SERIAL_OUTPUT,
@@ -339,9 +319,7 @@ static struct cx22702_config hauppauge_hvr1100_config = {
         .demod_address = 0x63,
         .output_mode   = CX22702_SERIAL_OUTPUT,
 };
-#endif
 
-#ifdef HAVE_OR51132
 static int or51132_set_ts_param(struct dvb_frontend* fe,
                                 int is_punctured)
 {
@@ -354,9 +332,7 @@ static struct or51132_config pchdtv_hd3000 = {
         .demod_address    = 0x15,
         .set_ts_params    = or51132_set_ts_param,
 };
-#endif
 
-#ifdef HAVE_LGDT330X
 static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
                                      struct dvb_frontend_parameters* params)
 {
@@ -444,9 +420,7 @@ static struct lgdt330x_config pchdtv_hd5500 = {
         .serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
         .set_ts_params    = lgdt330x_set_ts_param,
 };
-#endif
 
-#ifdef HAVE_NXT200X
 static int nxt200x_set_ts_param(struct dvb_frontend* fe,
                                 int is_punctured)
 {
@@ -469,9 +443,7 @@ static struct nxt200x_config ati_hdtvwonder = {
         .set_pll_input    = nxt200x_set_pll_input,
         .set_ts_params    = nxt200x_set_ts_param,
 };
-#endif
 
-#ifdef HAVE_CX24123
 static int cx24123_set_ts_param(struct dvb_frontend* fe,
         int is_punctured)
 {
@@ -525,7 +497,6 @@ static struct cx24123_config kworld_dvbs_100_config = {
         .demod_address          = 0x15,
         .set_ts_params          = cx24123_set_ts_param,
 };
-#endif
 
 static int dvb_register(struct cx8802_dev *dev)
 {
@@ -535,7 +506,6 @@ static int dvb_register(struct cx8802_dev *dev)
 
         /* init frontend */
         switch (dev->core->board) {
-#ifdef HAVE_CX22702
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
                 dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_novat_config,
                                                    &dev->core->i2c_adap);
@@ -568,10 +538,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &dvb_pll_fmd1216me);
                 }
                 break;
-#endif
-#if defined(HAVE_MT352) || defined(HAVE_ZL10353)
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
-#ifdef HAVE_MT352
                 dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
@@ -580,8 +547,6 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &dvb_pll_thomson_dtt7579);
                         break;
                 }
-#endif
-#ifdef HAVE_ZL10353
                 /* ZL10353 replaces MT352 on later cards */
                 dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1,
                                                    &dev->core->i2c_adap);
@@ -590,10 +555,8 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &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 = dvb_attach(mt352_attach, &dvico_fusionhdtv_dual,
@@ -604,8 +567,6 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &dvb_pll_thomson_dtt7579);
                         break;
                 }
-#endif
-#ifdef HAVE_ZL10353
                 /* ZL10353 replaces MT352 on later cards */
                 dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1,
                                                    &dev->core->i2c_adap);
@@ -614,10 +575,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt7579);
                 }
-#endif
                 break;
-#endif /* HAVE_MT352 || HAVE_ZL10353 */
-#ifdef HAVE_MT352
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
                 dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv,
                                                  &dev->core->i2c_adap);
@@ -651,8 +609,6 @@ static int dvb_register(struct cx8802_dev *dev)
                 printk("%s: built without vp3054 support\n", dev->core->name);
 #endif
                 break;
-#endif
-#ifdef HAVE_ZL10353
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_thomson_fe6600;
@@ -662,8 +618,6 @@ static int dvb_register(struct cx8802_dev *dev)
                         dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
                 }
                 break;
-#endif
-#ifdef HAVE_OR51132
         case CX88_BOARD_PCHDTV_HD3000:
                 dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000,
                                                  &dev->core->i2c_adap);
@@ -673,8 +627,6 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &dvb_pll_thomson_dtt761x);
                 }
                 break;
-#endif
-#ifdef HAVE_LGDT330X
         case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
                 dev->ts_gen_cntrl = 0x08;
                 {
@@ -750,8 +702,6 @@ static int dvb_register(struct cx8802_dev *dev)
                 }
                 }
                 break;
-#endif
-#ifdef HAVE_NXT200X
         case CX88_BOARD_ATI_HDTVWONDER:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach, &ati_hdtvwonder,
                                                  &dev->core->i2c_adap);
@@ -761,8 +711,6 @@ static int dvb_register(struct cx8802_dev *dev)
                                        &dvb_pll_tuv1236d);
                 }
                 break;
-#endif
-#ifdef HAVE_CX24123
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
                 dev->dvb.frontend = dvb_attach(cx24123_attach, &hauppauge_novas_config,
@@ -788,7 +736,6 @@ static int dvb_register(struct cx8802_dev *dev)
                         dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;
                 }
                 break;
-#endif
         default:
                 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
                        dev->core->name);
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index be7b9ee697d6..89a1565b4256 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -16,8 +16,5 @@ EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 
 extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
-extra-cflags-$(CONFIG_DVB_MT352)     += -DHAVE_MT352=1
-extra-cflags-$(CONFIG_DVB_TDA1004X)  += -DHAVE_TDA1004X=1
-extra-cflags-$(CONFIG_DVB_NXT200X)   += -DHAVE_NXT200X=1
 
 EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 7bc3af7af50c..fdd1bb51e807 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -34,16 +34,10 @@
 #include <media/v4l2-common.h>
 #include "dvb-pll.h"
 
-#ifdef HAVE_MT352
-# include "mt352.h"
-# include "mt352_priv.h" /* FIXME */
-#endif
-#ifdef HAVE_TDA1004X
-# include "tda1004x.h"
-#endif
-#ifdef HAVE_NXT200X
-# include "nxt200x.h"
-#endif
+#include "mt352.h"
+#include "mt352_priv.h" /* FIXME */
+#include "tda1004x.h"
+#include "nxt200x.h"
 
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -54,8 +48,6 @@ module_param(antenna_pwr, int, 0444);
 MODULE_PARM_DESC(antenna_pwr,"enable antenna power (Pinnacle 300i)");
 
 /* ------------------------------------------------------------------ */
-
-#ifdef HAVE_MT352
 static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on)
 {
         u32 ok;
@@ -185,12 +177,8 @@ static struct mt352_config avermedia_777 = {
         .demod_address = 0xf,
         .demod_init    = mt352_aver777_init,
 };
-#endif
 
 /* ------------------------------------------------------------------ */
-
-#ifdef HAVE_TDA1004X
-
 static int philips_tda6651_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
         struct saa7134_dev *dev = fe->dvb->priv;
@@ -1014,11 +1002,8 @@ static struct tda1004x_config md8800_dvbt_config = {
         .request_firmware = NULL,
 };
 
-#endif
-
 /* ------------------------------------------------------------------ */
 
-#ifdef HAVE_NXT200X
 static struct nxt200x_config avertvhda180 = {
         .demod_address    = 0x0a,
 };
@@ -1036,7 +1021,6 @@ static struct nxt200x_config kworldatsc110 = {
         .demod_address    = 0x0a,
         .set_pll_input    = nxt200x_set_pll_input,
 };
-#endif
 
 /* ------------------------------------------------------------------ */
 
@@ -1054,7 +1038,6 @@ static int dvb_init(struct saa7134_dev *dev)
                             dev);
 
         switch (dev->board) {
-#ifdef HAVE_MT352
         case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
                 printk("%s: pinnacle 300i dvb setup\n",dev->name);
                 dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i,
@@ -1063,7 +1046,6 @@ static int dvb_init(struct saa7134_dev *dev)
                         dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
                 }
                 break;
-
         case SAA7134_BOARD_AVERMEDIA_777:
                 printk("%s: avertv 777 dvb setup\n",dev->name);
                 dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
@@ -1072,8 +1054,6 @@ static int dvb_init(struct saa7134_dev *dev)
                         dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
                 }
                 break;
-#endif
-#ifdef HAVE_TDA1004X
         case SAA7134_BOARD_MD7134:
                 dev->dvb.frontend = dvb_attach(tda10046_attach, &medion_cardbus,
                                                     &dev->i2c_adap);
@@ -1207,8 +1187,6 @@ static int dvb_init(struct saa7134_dev *dev)
                         dev->dvb.frontend->ops.tuner_ops.set_params = md8800_dvbt_pll_set;
                 }
                 break;
-#endif
-#ifdef HAVE_NXT200X
         case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap);
                 if (dev->dvb.frontend) {
@@ -1221,7 +1199,6 @@ static int dvb_init(struct saa7134_dev *dev)
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tuv1236d);
                 }
                 break;
-#endif
         default:
                 printk("%s: Huh? unknown DVB card?\n",dev->name);
                 break;