diff options
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/Make.config | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 0a03a991a..8bf9c704c 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-12-22 20:14 mkrufky + + * v4l/Make.config: + - enable build of dvb-kernel modules in 2.6.10 and 2.6.11. + This might also work for 2.6.9 and earlier, + but I haven't been able to test it yet. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-12-22 19:03 mkrufky * linux/drivers/media/video/videodev.c: (show_dev), diff --git a/v4l/Make.config b/v4l/Make.config index 78a271847..1aaea7e4f 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -16,17 +16,17 @@ CONFIG_VIDEO_DECODER := m CONFIG_VIDEO_ALSA := n CONFIG_VIDEO_ADV_DEBUG := y -# doesn't build on kernels older than 2.6.12 +# doesn't build on older kernels +CONFIG_DVB_CORE := n CONFIG_VIDEO_BUF_DVB := n CONFIG_VIDEO_CX88_DVB := n CONFIG_VIDEO_SAA7134_DVB := n -# requires merged v4l/dvb tree +# requires dvb-core CONFIG_DVB_BT8XX := n CONFIG_DVB_FRONTENDS := n -CONFIG_DVB_CORE := n CONFIG_DVB_B2C2_FLEXCOP := n CONFIG_DVB_B2C2_FLEXCOP_PCI := n CONFIG_DVB_B2C2_FLEXCOP_USB := n @@ -54,6 +54,7 @@ CONFIG_VIDEO_SAA7146 := n CONFIG_VIDEO_SAA7146_VV := n ifneq ($(KERNELRELEASE),) + CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m) CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m) CONFIG_VIDEO_DEV := $(shell test $(SUBLEVEL) -ge 6 && echo m) CONFIG_EM28XX := $(shell test $(PATCHLEVEL) -ge 6 && echo m) @@ -62,9 +63,11 @@ endif ifeq ($(CONFIG_VIDEO_BUF_DVB),m) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m +endif + +ifeq ($(CONFIG_DVB_CORE),m) CONFIG_DVB_BT8XX := m CONFIG_DVB_FRONTENDS := m - CONFIG_DVB_CORE := m CONFIG_DVB_B2C2_FLEXCOP := m CONFIG_DVB_B2C2_FLEXCOP_PCI := m CONFIG_DVB_B2C2_FLEXCOP_USB := m |