V4L/DVB (4214): Make VIDEO_CX2341X a selectable build option

The cx2341x mpeg encoder module is used by cx88-blackbird, pvrusb2 and
the external ivtv driver. This patch allows for cx2341x to be selected without
having to also select cx88-blackbird. This will be needed to build the external
ivtv driver or the standalone pvrusb2 driver against kernel 2.6.18

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 583d151b7486a3d1911cba4fbe149242d2c0b98b..ef52e6da01ed9bc8a0d3ea0f0a43c3dfb2e523c5 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -82,9 +82,6 @@ config VIDEO_IR
 config VIDEO_TVEEPROM
        tristate
 
-config VIDEO_CX2341X
-       tristate
-
 config USB_DABUSB
        tristate "DABUSB driver"
        depends on USB

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 824a63c92629ddf8566ec760f1e8bb314d4ff545..e4290491fa9e15f4920317c65536f100f180164c 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -381,6 +381,18 @@ config VIDEO_WM8739
          To compile this driver as a module, choose M here: the
          module will be called wm8739.
 
+config VIDEO_CX2341X
+       tristate "Conexant CX2341x MPEG encoders"
+       depends on VIDEO_V4L2 && EXPERIMENTAL
+       ---help---
+         Support for the Conexant CX23416 MPEG encoders
+         and CX23415 MPEG encoder/decoders.
+
+         This module currently supports the encoding functions only.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cx2341x.
+
 source "drivers/media/video/cx25840/Kconfig"
 
 config VIDEO_SAA711X