summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-06-24 20:47:21 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-26 09:20:56 -0300
commit3446807d6e9ccf4b21476b0b143d35fcc964be4b (patch)
tree6c506631ebc234f62c615d6b56f77aabd53318b7 /drivers
parentdff47bf21be002b3f0a6562d368474c41971b448 (diff)
downloadop-kernel-dev-3446807d6e9ccf4b21476b0b143d35fcc964be4b.zip
op-kernel-dev-3446807d6e9ccf4b21476b0b143d35fcc964be4b.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/Kconfig3
-rw-r--r--drivers/media/video/Kconfig12
2 files changed, 12 insertions, 3 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 583d151..ef52e6d 100644
--- 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 824a63c..e429049 100644
--- 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
OpenPOWER on IntegriCloud