diff options
| -rw-r--r-- | v4l/Makefile | 27 | ||||
| -rw-r--r-- | v4l/compat.h | 13 |
2 files changed, 0 insertions, 40 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index c74019f45..864ae6732 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -18,11 +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 @@ -35,28 +30,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 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 |