Skip to content

Commit

Permalink
V4L/DVB (3495): Kconfig: select VIDEO_CX25840 to build cx25840 a/v de…
Browse files Browse the repository at this point in the history
…coder 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>
  • Loading branch information
Michael Krufky authored and Linus Torvalds committed Mar 21, 2006
1 parent 31dcbf9 commit f6fe8c6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions drivers/media/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion drivers/media/video/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions drivers/media/video/cx25840/Kconfig
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion drivers/media/video/cx25840/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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)/..

0 comments on commit f6fe8c6

Please sign in to comment.