diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 1 | ||||
| -rw-r--r-- | v4l/Makefile.ivtv | 25 | ||||
| -rwxr-xr-x | v4l/scripts/make_makefile.pl | 1 | ||||
| -rw-r--r-- | v4l/versions.txt | 14 |
4 files changed, 41 insertions, 0 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index ad1f1ac23..e932eeb65 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -13,6 +13,7 @@ default:: Makefile.media links .version -include $(obj)/.myconfig -include $(obj)/Makefile.media +-include $(obj)/Makefile.ivtv ################################################# # CFLAGS configuration diff --git a/v4l/Makefile.ivtv b/v4l/Makefile.ivtv new file mode 100644 index 000000000..69962f9e4 --- /dev/null +++ b/v4l/Makefile.ivtv @@ -0,0 +1,25 @@ +# +# ivtv build rules +# +CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) +CONFIG_VIDEO_CX88_IVTV := $(if $(wildcard $(src)/cx88-ivtv.c),m) + +ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o \ + ivtv-streams.o ivtv-firmware.o ivtv-reset.o \ + ivtv-gpio.o ivtv-queue.o ivtv-irq.o ivtv-mailbox.o \ + ivtv-vbi.o ivtv-kthreads.o ivtv-audio.o ivtv-ioctl.o \ + ivtv-controls.o ivtv-video.o ivtv-cards.o ivtv-yuv.o +ivtv-fb-objs := ivtv-osd.o ivtv-queue.o + +obj-$(CONFIG_VIDEO_IVTV) += ivtv.o ivtv-fb.o +obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o + +ivtv-install:: + @echo -e "\nInstalling $(KDIR26)/video/ivtv files:" + @install -d $(KDIR26)/video/ivtv + @files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; install -m 644 -c $$i $(KDIR26)/video/ivtv; fi; done; echo; + /sbin/depmod -a ${KERNELRELEASE} + +ivtv-rminstall:: + @echo -e "\nRemoving old $(KDIR26)/video/ivtv files:" + @files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i ]; then echo -n "$$i "; rm $(KDIR26)/video/ivtv/$$i; fi; done; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i.gz ]; then echo -n "$$i.gz "; rm $(KDIR26)/video/ivtv/$$i.gz; fi; done; echo; diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 116df3394..8371f6a4a 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -124,6 +124,7 @@ while ( my ($key, $value) = each(%instdir) ) { printf OUT "for i in \$\$files;do if [ -e \$\$i ]; then echo -n \"\$\$i \";"; printf OUT " install -m 644 -c \$\$i \$(KDIR26)/$key; fi; done; echo;\n\n"; } +printf OUT "\t/sbin/depmod -a \${KERNELRELEASE}\n\n"; # Creating Remove rule printf OUT "remove rminstall::\n"; diff --git a/v4l/versions.txt b/v4l/versions.txt index c6c0ecd3b..255a31b17 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -10,6 +10,16 @@ VIDEO_PLANB VIDEO_VINO VIDEO_M32R_AR_M64278 +[2.6.16] +VIDEO_USBVIDEO +USB_VICAM +USB_IBMCAM +USB_KONICAWC +USB_ET61X251 +USB_PWC +USB_SN9C102 +USB_ZC0301 + [2.6.14] VIDEO_ZORAN VIDEO_ZORAN_BUZ @@ -66,7 +76,11 @@ RADIO_ZOLTRIX RADIO_ZOLTRIX_PORT [2.6.12] +VIDEO_VIVI VIDEO_DEV +VIDEO_V4L1 +VIDEO_V4L2 +VIDEO_V4L1_COMPAT VIDEO_ADV_DEBUG VIDEO_BT848 VIDEO_BT848_DVB |