V4L/DVB (6092): ivtv: more cleanups, merged ivtv-audio.c and ivtv-video.c into ivtv-routing.c

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index 90e2d1270561..6998781e2b11 100644
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -1,8 +1,8 @@
-ivtv-objs       := ivtv-audio.o ivtv-cards.o ivtv-controls.o \
+ivtv-objs       := ivtv-routing.o ivtv-cards.o ivtv-controls.o \
                    ivtv-driver.o ivtv-fileops.o ivtv-firmware.o \
                    ivtv-gpio.o ivtv-i2c.o ivtv-ioctl.o ivtv-irq.o \
                    ivtv-mailbox.o ivtv-queue.o ivtv-streams.o ivtv-udma.o \
-                   ivtv-vbi.o ivtv-video.o ivtv-yuv.o
+                   ivtv-vbi.o ivtv-yuv.o
 
 obj-$(CONFIG_VIDEO_IVTV) += ivtv.o
 obj-$(CONFIG_VIDEO_IVTV_FB) += ivtv-fb.o