diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
| commit | d669af9d5afb5bdb629f78d024b35e507465f570 (patch) | |
| tree | 711ab23d69098fa05973b69efbd0ae61cc7ff927 /drivers/media/video/Makefile | |
| parent | 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff) | |
| parent | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/Makefile')
| -rw-r--r-- | drivers/media/video/Makefile | 3 |
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 \ | |||
| 8 | zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o | 8 | zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o |
| 9 | zr36067-objs := zoran_procfs.o zoran_device.o \ | 9 | zr36067-objs := zoran_procfs.o zoran_device.o \ |
| 10 | zoran_driver.o zoran_card.o | 10 | zoran_driver.o zoran_card.o |
| 11 | tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o | 11 | tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ |
| 12 | mt20xx.o tda8290.o tea5767.o | ||
| 12 | 13 | ||
| 13 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o | 14 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o |
| 14 | 15 | ||