diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/Makefile | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9452b3817..34803a46c 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-12-09 22:02 mchehab + + * linux/drivers/media/video/videodev.c: + * v4l/Makefile: + - make videodev.c compile under V4L/DVB tree + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-08 21:35 mchehab * linux/drivers/media/video/compat_ioctl32.c: (native_ioctl), diff --git a/v4l/Makefile b/v4l/Makefile index 7eec0f353..03ad2b9f0 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -9,7 +9,7 @@ include $(obj)/Make.config # symbol exports export-objs := video-buf.o v4l1-compat.o v4l2-common.o -export-objs += ir-common.o +export-objs += ir-common.o videodev.o export-objs += bttv-if.o btcx-risc.o export-objs += cx88-cards.o cx88-core.o export-objs += saa7134-core.o saa7134-tvaudio.o @@ -60,7 +60,7 @@ 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 +obj-m += compat_ioctl32.o videodev.o 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 \ @@ -240,7 +240,7 @@ endif inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko -inst_video += video-buf.ko video-buf-dvb.ko +inst_video += video-buf.ko video-buf-dvb.ko videodev.ko inst_video += ir-kbd-gpio.ko ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko |