7 files changed, 7 insertions, 62 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 630782f88..353b9e987 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -14,7 +14,7 @@
 #include "stv0297_cs2.h"
 #include "mt312.h"
 #include "lgdt330x.h"
-#include "fe_lgh06xf.h"
+#include "lg_h06xf.h"
 #include "dvb-pll.h"
 
 /* lnb control */
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index ad261b593..a7c1e7867 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -40,7 +40,7 @@
 #include "cx24110.h"
 #include "or51211.h"
 #include "lgdt330x.h"
-#include "fe_lgh06xf.h"
+#include "lg_h06xf.h"
 #include "zl10353.h"
 
 struct dvb_bt8xx_card {
diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c
index 11c8c9812..f0bdb7323 100644
--- a/linux/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c
@@ -27,7 +27,7 @@
 
 #include "cx22702.h"
 #include "lgdt330x.h"
-#include "fe_lgh06xf.h"
+#include "lg_h06xf.h"
 #include "mt352.h"
 #include "mt352_priv.h"
 
diff --git a/linux/drivers/media/dvb/frontends/fe_lgh06xf.h b/linux/drivers/media/dvb/frontends/lg_h06xf.h
index c5e8b5ff1..355a4a498 100644
--- a/linux/drivers/media/dvb/frontends/fe_lgh06xf.h
+++ b/linux/drivers/media/dvb/frontends/lg_h06xf.h
@@ -1,5 +1,5 @@
 /*
- *  fe_lgh06xf.h - ATSC Tuner support for LG TDVS H06xF
+ *  lg_h06xf.h - ATSC Tuner support for LG TDVS-H06xF
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef FE_LGH06XF_H
-#define FE_LGH06XF_H
+#ifndef _LG_H06XF_H_
+#define _LG_H06XF_H_
 #include "dvb-pll.h"
 
 static int lg_h06xf_pll_set(struct dvb_frontend* fe, struct i2c_adapter* i2c_adap,
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index fbd8387de..a65306c0d 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -52,7 +52,7 @@
 #endif
 #ifdef HAVE_LGDT330X
 # include "lgdt330x.h"
-# include "fe_lgh06xf.h"
+# include "lg_h06xf.h"
 #endif
 #ifdef HAVE_NXT200X
 # include "nxt200x.h"
diff --git a/v4l/Makefile b/v4l/Makefile
index 9acafb007..dc7836557 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -18,15 +18,6 @@ default:: Makefile.media links .version
 #################################################
 # CFLAGS configuration
 
-# for DVB
-EXTRA_CFLAGS += -DDVB_CVS=1
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
-
-ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_ADV_DEBUG=1
-endif
-
 ifeq ($(CONFIG_XC3028),m)
  EXTRA_CFLAGS += -DCONFIG_XC3028=1
 endif
@@ -35,28 +26,6 @@ ifeq ($(CONFIG_DVB_FIRESAT),m)
   EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
 endif
 
-ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1
- EXTRA_CFLAGS += -DHAVE_CX22702=1
- EXTRA_CFLAGS += -DHAVE_OR51132=1
- EXTRA_CFLAGS += -DHAVE_LGDT330X=1
- EXTRA_CFLAGS += -DHAVE_MT352=1
- EXTRA_CFLAGS += -DHAVE_ZL10353=1
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
- EXTRA_CFLAGS += -DHAVE_CX24123=1
- EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1
-endif
-
-ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m)
- EXTRA_CFLAGS += -DHAVE_MT352=1
- EXTRA_CFLAGS += -DHAVE_TDA1004X=1
- EXTRA_CFLAGS += -DHAVE_NXT200X=1
-endif
-
-ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
- EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1
-endif
-
 ifeq ($(CONFIG_DVB_AV7110_OSD),y)
  EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1
 endif
@@ -65,17 +34,6 @@ ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
   EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE
 endif
 
-# for pvrusb2
-ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS
-endif
-ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC
-endif
-ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y)
- EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX
-endif
-
 EXTRA_CFLAGS += -g
 
 EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
diff --git a/v4l/compat.h b/v4l/compat.h
index 9efcfebd1..0bcb238fb 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -131,19 +131,6 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
 }
 #endif
 
-#ifndef DVB_CVS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_LGDT330X
-#undef HAVE_TDA1004X
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
-#undef HAVE_NXT200X
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-#undef HAVE_CX24123
-#endif
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 /* some keys from 2.6.x which are not (yet?) in 2.4.x */
 # define KEY_PLAY                207