From d4549800b917c3ad6c3b15840e5b7f79f50f1df3 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 13 Mar 2006 21:44:31 -0500 Subject: Kconfig: select VIDEO_MSP3400 to build msp3400.ko From: Michael Krufky The msp3400 driver is currently only being built if the bttv driver is selected. There are new drivers that will be needing msp3400, so simply including msp3400 in the Makefile is no longer appropriate. This patch creates VIDEO_MSP3400, and alters VIDEO_BT848, VIDEO_PVRUSB2 and VIDEO_AUDIO_DECODER each to select VIDEO_MSP3400. Signed-off-by: Michael Krufky --- linux/drivers/media/video/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/video/Makefile') diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 02bd94f0f..32bf5055d 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -15,7 +15,7 @@ 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 msp3400.o tvaudio.o \ +obj-$(CONFIG_VIDEO_BT848) += bttv.o tvaudio.o \ tda7432.o tda9875.o ir-kbd-i2c.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o @@ -46,7 +46,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ -obj-$(CONFIG_VIDEO_PVRUSB2) += msp3400.o +obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ -- cgit v1.2.3 From 6902d4a10e9127767db0698d0cdf6836437db344 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 13 Mar 2006 22:35:07 -0500 Subject: Kconfig: select VIDEO_CX25840 to build cx25840 a/v decoder module From: Michael Krufky The cx25840 module requires external firmware in order to function, so it must select FW_LOADER, but saa7115 and saa7129 do not require it. This patch creates VIDEO_CX25840, and alters VIDEO_DECODER to select it. Signed-off-by: Michael Krufky --- linux/drivers/media/video/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linux/drivers/media/video/Makefile') diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 32bf5055d..aa3c6b68d 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o -obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840/ saa7127.o +obj-$(CONFIG_VIDEO_DECODER) += saa7115.o saa7127.o +obj-$(CONFIG_VIDEO_CX25840) += cx25840/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core -- cgit v1.2.3 From 038fc7e30dab850f62642c70426cbfe7bd22b2a8 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 13 Mar 2006 23:25:01 -0500 Subject: remove redundant makefile inclusion of tuner.o From: Michael Krufky VIDEO_MXB selects VIDEO_TUNER, so we don't have to include tuner.o in the Makefile. Signed-off-by: Michael Krufky --- linux/drivers/media/video/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media/video/Makefile') diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index aa3c6b68d..ea0c029fb 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -50,7 +50,7 @@ obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ -obj-$(CONFIG_VIDEO_MXB) += saa7111.o tuner.o tda9840.o tea6415c.o tea6420.o mxb.o +obj-$(CONFIG_VIDEO_MXB) += saa7111.o tda9840.o tea6415c.o tea6420.o mxb.o obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o obj-$(CONFIG_VIDEO_DPC) += saa7111.o dpc7146.o -- cgit v1.2.3