Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / ivtv / Makefile

diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index 7e95148fbf4fc44c0c114c5c07d592d018e3d66e..26ce0d6eaee1a3c15a918783130b26eb713827da 100644 (file)
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -1,7 +1,14 @@
-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_FB_IVTV) += ivtvfb.o
+
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/common/tuners
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+