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>

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f6889f771053d126e3e56868aa5002de9317a362..a76036ff9a9c0879251045e2e5f2de2a25216892 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 87b1ce6e2050a89c34841b30e174e66ab3efba77..c15f8490b36503c159455ee4fa567cb6a68f4e8b 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -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

diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
new file mode 100644 (file)
index 0000000..854264e
--- /dev/null
+++ b/drivers/media/video/cx25840/Kconfig
@@ -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

diff --git a/drivers/media/video/cx25840/Makefile b/drivers/media/video/cx25840/Makefile
index 543ebacdc9d71667e99f6e82c93a9a85eb32988f..32a896c23d1e418677158848fa1fe3e86769cb7b 100644 (file)
--- a/drivers/media/video/cx25840/Makefile
+++ b/drivers/media/video/cx25840/Makefile
@@ -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)/..