diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 15:43:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 15:43:27 -0300 |
| commit | 8f0f86249bec74bed8cdcc2c9e587990e2a1d003 (patch) | |
| tree | 044b4dfefce05236d41b85ffb74325398ea403ed /linux/drivers/media/video/Makefile | |
| parent | 2fc74336805f6956eb1b58852adf962315899b82 (diff) | |
| parent | af5c304dd2ff48d0e3782f1db2c84f7d258642f1 (diff) | |
| download | mediapointer-dvb-s2-8f0f86249bec74bed8cdcc2c9e587990e2a1d003.tar.gz mediapointer-dvb-s2-8f0f86249bec74bed8cdcc2c9e587990e2a1d003.tar.bz2 | |
Merge from manu tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/Makefile')
| -rw-r--r-- | linux/drivers/media/video/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 2b88cfdd2..27e7b37b1 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -2,9 +2,6 @@ # Makefile for the video capture/playback device drivers. # -bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ - bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \ - bttv-input.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 @@ -15,8 +12,8 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o -obj-$(CONFIG_VIDEO_BT848) += bttv.o tvaudio.o \ - tda7432.o tda9875.o ir-kbd-i2c.o +obj-$(CONFIG_VIDEO_BT848) += bt8xx/ +obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o obj-$(CONFIG_VIDEO_ZR36120) += zoran.o |