diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-06-24 19:47:21 -0400 |
---|---|---|
committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-06-24 19:47:21 -0400 |
commit | 0a5482d16ed504ebb0bae176713b45d023810514 (patch) | |
tree | cce558e6ff28e8e32a08e432dd294a0f14d854d6 | |
parent | f6435855e8739a699a8093de435f8862db21b582 (diff) | |
download | mediapointer-dvb-s2-0a5482d16ed504ebb0bae176713b45d023810514.tar.gz mediapointer-dvb-s2-0a5482d16ed504ebb0bae176713b45d023810514.tar.bz2 |
make VIDEO_CX2341X a selectable build option
From: Michael Krufky <mkrufky@linuxtv.org>
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>
-rw-r--r-- | linux/drivers/media/Kconfig | 3 | ||||
-rw-r--r-- | linux/drivers/media/video/Kconfig | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index 583d151b7..ef52e6da0 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/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/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 2ed46e87e..6d532f170 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/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 |