diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 16 | ||||
| -rw-r--r-- | v4l/Make.config | 5 | ||||
| -rw-r--r-- | v4l/Makefile | 3 |
3 files changed, 22 insertions, 2 deletions
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 |