Add ivtv driver for the Conexant cx23416/cx23415 MPEG encoder/decoder

From: Hans Verkuil <hverkuil@xs4all.nl>

It took three core maintainers, over four years of work, eight new i2c
modules, eleven new V4L2 ioctls, three new DVB video ioctls, a Sliced
VBI API, a new MPEG encoder API, an enhanced DVB video MPEG decoding
API, major YUV/OSD contributions from Ian and John, web/wiki/svn/trac
support from Axel Thimm, (hardware) support from Hauppauge, support and
assistance from the v4l-dvb people and the many, many users of ivtv to
finally make it possible to merge this driver into the kernel.

Thank you all!

Signed-off-by: Kevin Thayer <nufan_wfk@yahoo.com>
Signed-off-by: Chris Kennedy <c@groovy.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: John P Harvey <john.p.harvey@btinternet.com>
Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>

2 files changed, 4 insertions, 50 deletions

diff --git a/v4l/Makefile b/v4l/Makefile
index f08143def..0b2f54c99 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -40,7 +40,7 @@ default:: config-compat.h Makefile.media links $(obj)/.version oss
 # Targets which don't need Makefile.media's rules
 no-makefile-media-targets := %config clean distclean release snapshot snap \
 	tarball release %links start insmod load stop rmmod unload reload \
-	card% update push %commit help debug ivtv% cx88-ivtv lxdialog
+	card% update push %commit help debug cx88-ivtv lxdialog
 
 # Targets which don't need .myconfig to exist, to keep us from including it
 no-dot-config-targets := $(no-makefile-media-targets) %install remove
@@ -69,7 +69,6 @@ ifeq ($(makefile-media),1)
 endif
 
 -include $(obj)/.kconfig.dep
--include $(obj)/Makefile.ivtv
 
 # make will try to automatically rebuild the Makefile and all includes,
 # and if any of them change, make will start over with the updated files
@@ -183,9 +182,9 @@ all:: default
 #################################################
 # installation invocation rules
 
-install:: media-install ivtv-install
+install:: media-install
 
-remove rminstall:: media-rminstall ivtv-rminstall
+remove rminstall:: media-rminstall
 
 #################################################
 # Compiling preparation rules
@@ -271,7 +270,7 @@ clean::
 	@find . -name '*.c' -type l -exec rm '{}' \;
 	@find . -name '*.h' -type l -exec rm '{}' \;
 	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
-		ivtv-svnversion.h config-compat.h
+		config-compat.h
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d Makefile.media \
@@ -365,30 +364,6 @@ $(LXDIALOG):
 	$(MAKE) -C $(KDIR) -f $(PWD)/Makefile.kernel $(KMAKEVARS) v4l-$(LXDIALOG)
 endif
 
-#################################################
-# IVTV link rules
-
-ivtv-checkout::
-	@if [ ! -d ivtv ]; then \
-		echo retrieving the latest ivtv sources from ivtvdriver.org; \
-		echo this step requires subversion to be installed; \
-		svn co http://www.ivtvdriver.org/svn/ivtv/trunk ivtv; \
-	fi
-
-ivtv-update ivtv-up:: ivtv
-	@svn up ivtv
-
-ivtv-links:: ivtv-checkout
-	@echo creating ivtv symbolic links...
-	@find ivtv/driver -name '*.[ch]' -type f -exec ln -sf '{}' . \;
-	@find ivtv/i2c-drivers -name '*.[ch]' -type f -exec ln -sf '{}' . \;
-
-ivtv:: ivtv-links
-	@echo '#define IVTV_DRIVER_VERSION_COMMENT ' \
-		'"(v4l-dvb + ivtv virtual merge)' \
-		"`svn info ivtv | grep Revision`"'"' > ivtv-svnversion.h
-	@echo ivtv trunk merged. Run make to build the entire tree.
-
 cx88-ivtv::
 	@echo creating cx88-ivtv symbolic links...
 	@ln -sf ../v4l_experimental/cx88-ivtv.c .
diff --git a/v4l/Makefile.ivtv b/v4l/Makefile.ivtv
deleted file mode 100644
index fa747cd4f..000000000
--- a/v4l/Makefile.ivtv
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# ivtv build rules
-#
-CONFIG_VIDEO_IVTV	:= $(if $(wildcard $(src)/ivtv-svnversion.h),m)
-CONFIG_VIDEO_CX88_IVTV	:= $(if $(wildcard $(src)/cx88-ivtv.c),m)
-
-ifeq ($(CONFIG_VIDEO_IVTV),m)
--include $(obj)/ivtv/driver/Kbuild
-endif
-
-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;