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: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
committed by
Linus Torvalds
parent
31dcbf994b
commit
f6fe8c6a42
@@ -359,8 +359,11 @@ config VIDEO_AUDIO_DECODER
|
|||||||
config VIDEO_DECODER
|
config VIDEO_DECODER
|
||||||
tristate "Add support for additional video chipsets"
|
tristate "Add support for additional video chipsets"
|
||||||
depends on VIDEO_DEV && I2C && EXPERIMENTAL
|
depends on VIDEO_DEV && I2C && EXPERIMENTAL
|
||||||
|
select VIDEO_CX25840
|
||||||
---help---
|
---help---
|
||||||
Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
|
Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
|
||||||
video decoders.
|
video decoders.
|
||||||
|
|
||||||
|
source "drivers/media/video/cx25840/Kconfig"
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
@@ -62,6 +62,7 @@ obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
|
|||||||
|
|
||||||
obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.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
|
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
|
||||||
|
9
drivers/media/video/cx25840/Kconfig
Normal file
9
drivers/media/video/cx25840/Kconfig
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
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
|
@@ -1,6 +1,6 @@
|
|||||||
cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
|
cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
|
||||||
cx25840-vbi.o
|
cx25840-vbi.o
|
||||||
|
|
||||||
obj-$(CONFIG_VIDEO_DECODER) += cx25840.o
|
obj-$(CONFIG_VIDEO_CX25840) += cx25840.o
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(src)/..
|
EXTRA_CFLAGS += -I$(src)/..
|
||||||
|
Reference in New Issue
Block a user