diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:42:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:42:38 -0300 |
| commit | 6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9 (patch) | |
| tree | f1ba4993d5a649af938967c928f1a78e945f747a /linux/drivers/media/video/Makefile | |
| parent | 503d9b1655773c65ef2d3c1d7f6e67c91717ec74 (diff) | |
| parent | 32027c8007a8b9e82f70f5eb52387db827ff8b2d (diff) | |
| download | mediapointer-dvb-s2-6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9.tar.gz mediapointer-dvb-s2-6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9.tar.bz2 | |
Merge from mchehab saa7115 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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 3b8b6d627..2b88cfdd2 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -44,10 +44,11 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/ obj-$(CONFIG_VIDEO_CX88) += cx88/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ -obj-$(CONFIG_VIDEO_EM28XX) += saa7115.o tvp5150.o +obj-$(CONFIG_VIDEO_EM28XX) += tvp5150.o obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o -obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o +obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o +obj-$(CONFIG_VIDEO_WM8775) += wm8775.o obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ obj-$(CONFIG_VIDEO_MXB) += saa7111.o tda9840.o tea6415c.o tea6420.o mxb.o @@ -64,7 +65,8 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o -obj-$(CONFIG_VIDEO_DECODER) += saa7115.o saa7127.o obj-$(CONFIG_VIDEO_CX25840) += cx25840/ +obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o +obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core |