summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx25821/Makefile
diff options
context:
space:
mode:
authorHans Verkuil2013-04-14 17:10:32 +0200
committerMauro Carvalho Chehab2013-04-16 23:11:58 +0200
commit7087d31b0c9dddbca71b8e33d3f0a3b719afa397 (patch)
tree6ad09261fa0e6884132f40200f3efc6eea9f11aa /drivers/media/pci/cx25821/Makefile
parent[media] cx25821: add output format ioctls (diff)
downloadkernel-qcow2-linux-7087d31b0c9dddbca71b8e33d3f0a3b719afa397.tar.gz
kernel-qcow2-linux-7087d31b0c9dddbca71b8e33d3f0a3b719afa397.tar.xz
kernel-qcow2-linux-7087d31b0c9dddbca71b8e33d3f0a3b719afa397.zip
[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>
Diffstat (limited to 'drivers/media/pci/cx25821/Makefile')
-rw-r--r--drivers/media/pci/cx25821/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile
index b54a32e88bd0..407830c89df4 100644
--- a/drivers/media/pci/cx25821/Makefile
+++ b/drivers/media/pci/cx25821/Makefile
@@ -1,7 +1,6 @@
cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
cx25821-gpio.o cx25821-medusa-video.o \
cx25821-video.o cx25821-video-upstream.o \
- cx25821-video-upstream-ch2.o \
cx25821-audio-upstream.o
obj-$(CONFIG_VIDEO_CX25821) += cx25821.o