diff options
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/Makefile | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 810b0014f..1ff3b6e13 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-12-10 02:06 mchehab + + * v4l/Makefile: + - videodev will not compile if not marked in kernel as a module + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-10 01:39 mchehab * linux/drivers/media/video/compat_ioctl32.c: diff --git a/v4l/Makefile b/v4l/Makefile index 03ad2b9f0..d20bab383 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -60,7 +60,10 @@ saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o \ saa7146_video.o saa7146_hlp.o saa7146_vbi.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o -obj-m += compat_ioctl32.o videodev.o +obj-m += compat_ioctl32.o +ifeq ($(CONFIG_VIDEO_DEV),m) +obj-m += videodev.o +endif obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ |