[media] cx25821: drop cx25821-video-upstream-ch2.c/h
authorHans Verkuil <hans.verkuil@cisco.com>
Sun, 14 Apr 2013 15:10:32 +0000 (12:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 16 Apr 2013 21:11:58 +0000 (18:11 -0300)
commit7087d31b0c9dddbca71b8e33d3f0a3b719afa397
tree6ad09261fa0e6884132f40200f3efc6eea9f11aa
parente90878ab151f733b67d725a1e1e5aee04f431ce5
[media] cx25821: drop cx25821-video-upstream-ch2.c/h

cx25821-video-upstream_ch2.c/h is practically identical to cx25821-video-upstream.c/h
so add support for ch2 into cx25821-video-upstream.c instead.
After this we can replace the custom ioctls with a proper write() interface.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/pci/cx25821/Makefile
drivers/media/pci/cx25821/cx25821-core.c
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c [deleted file]
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.h [deleted file]
drivers/media/pci/cx25821/cx25821-video-upstream.c
drivers/media/pci/cx25821/cx25821-video.c
drivers/media/pci/cx25821/cx25821.h