Commit f6fe8c6a authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds
Browse files

V4L/DVB (3495): Kconfig: select VIDEO_CX25840 to build cx25840 a/v decoder module 



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: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 31dcbf99

drivers/media/video/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -359,8 +359,11 @@ config VIDEO_AUDIO_DECODER 
config VIDEO_DECODER

	tristate "Add support for additional video chipsets"

	depends on VIDEO_DEV && I2C && EXPERIMENTAL

	select VIDEO_CX25840

	---help---

	  Say Y here to compile drivers for SAA7115, SAA7127 and CX25840

	  video decoders.



source "drivers/media/video/cx25840/Kconfig"



endmenu

drivers/media/video/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -62,6 +62,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

drivers/media/video/cx25840/Kconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
config VIDEO_CX25840

	tristate "Conexant CX2584x audio/video decoders"

	depends on VIDEO_DEV && I2C && EXPERIMENTAL

	select FW_LOADER

	---help---

	  Support for the Conexant CX2584x audio/video decoders.



	  To compile this driver as a module, choose M here: the

	  module will be called cx25840

drivers/media/video/cx25840/Makefile

+1 −1
Original line number Diff line number Diff line 
cx25840-objs    := cx25840-core.o cx25840-audio.o cx25840-firmware.o \

		   cx25840-vbi.o



obj-$(CONFIG_VIDEO_DECODER) += cx25840.o

obj-$(CONFIG_VIDEO_CX25840) += cx25840.o



EXTRA_CFLAGS += -I$(src)/..

CRA Git | Maintained and supported by SUSTech CRA and CCSE