diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 10 | ||||
| -rw-r--r-- | v4l/ChangeLog | 16 | ||||
| -rw-r--r-- | v4l/Make.config | 5 | ||||
| -rw-r--r-- | v4l/Makefile | 3 |
5 files changed, 31 insertions, 9 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index f8c98a8aa..034c97419 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.85 2005/10/11 05:20:47 mkrufky Exp $ + * $Id: cx88.h,v 1.86 2005/10/11 20:11:34 mkrufky Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -30,7 +30,7 @@ #include <media/tveeprom.h> #include <media/audiochip.h> #include <media/video-buf.h> -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) +#ifdef HAVE_VIDEO_BUF_DVB #include <media/video-buf-dvb.h> #endif #include "compat.h" @@ -439,7 +439,7 @@ struct cx8802_dev { int width; int height; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) +#ifdef HAVE_VIDEO_BUF_DVB /* for dvb only */ struct videobuf_dvb dvb; void* fe_handle; diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index e50d2ab64..eb46ca890 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.62 2005/10/09 18:07:06 mchehab Exp $ + * $Id: saa7134.h,v 1.63 2005/10/11 20:11:34 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -28,6 +28,7 @@ #include <linux/videodev.h> #include <linux/kdev_t.h> #include <linux/input.h> +#include <linux/notifier.h> #include <asm/io.h> @@ -40,12 +41,13 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,64) #include <media/i2c-compat.h> #else -#include <media/video-buf-dvb.h> #include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> #endif - +#ifdef HAVE_VIDEO_BUF_DVB +#include <media/video-buf-dvb.h> +#endif #ifndef TRUE # define TRUE (1==1) @@ -508,7 +510,7 @@ struct saa7134_dev { struct work_struct empress_workqueue; int empress_started; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#ifdef HAVE_VIDEO_BUF_DVB /* SAA7134_MPEG_DVB only */ struct videobuf_dvb dvb; #endif diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 4ec482898..8c4242123 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,19 @@ +2005-10-11 20:09 mkrufky + + * ../linux/drivers/media/video/cx88/cx88.h: + * ../v4l/Make.config: + * ../v4l/Makefile: + - Allow to disable build of video-buf-dvb in Make.config + using compile flag CONFIG_VIDEO_BUF_DVB + - replaced check using this method: + -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + +#ifdef HAVE_VIDEO_BUF_DVB + + * ../linux/drivers/media/video/saa7134/saa7134.h: + - #include <linux/notifier.h> in saa7134.h to fix build + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-11 20:03 nshmyrev * v4l/compat.h: diff --git a/v4l/Make.config b/v4l/Make.config index e880c3bd1..7e31ec964 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -16,6 +16,7 @@ CONFIG_VIDEO_ALSA := n # doesn't build on kernels older than 2.6.12 +CONFIG_VIDEO_BUF_DVB := n CONFIG_VIDEO_CX88_DVB := n CONFIG_VIDEO_SAA7134_DVB := n @@ -25,10 +26,10 @@ CONFIG_DVB_BT8XX := n CONFIG_DVB_FRONTENDS := n ifneq ($(KERNELRELEASE),) -need_dvb := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo yes) + CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m) endif -ifeq ($(need_dvb),yes) +ifeq ($(CONFIG_VIDEO_BUF_DVB),m) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m endif diff --git a/v4l/Makefile b/v4l/Makefile index f3dd3f804..179481d6f 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -79,6 +79,9 @@ ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m) EXTRA_CFLAGS += -DHAVE_MT352=1 EXTRA_CFLAGS += -DHAVE_TDA1004X=1 endif +ifeq ($(CONFIG_VIDEO_BUF_DVB),m) + EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 +endif ################################################# # compile modules |