summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-01-18 09:14:51 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2006-01-18 09:14:51 +0000
commit2ff4782374dde5e3d76daf8a82eae396c0f76567 (patch)
tree42cc821174a3f3f410895fce16741948a1103e66 /drivers/media/video/Makefile
parentcd1344fe322cd9d95b2c0f011d6766677cfcb29b (diff)
parent7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff)
downloadblackbird-op-linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.tar.gz
blackbird-op-linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.zip
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/Makefile')
-rw-r--r--drivers/media/video/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index dd24896906fe..faf728366c4e 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -8,7 +8,8 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o
zr36067-objs := zoran_procfs.o zoran_device.o \
zoran_driver.o zoran_card.o
-tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
+tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \
+ mt20xx.o tda8290.o tea5767.o
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
OpenPOWER on IntegriCloud