Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[pandora-kernel.git] / drivers / media / video / cx88 / Kconfig

diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 6302739..80e23ee 100644 (file)
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -35,13 +35,25 @@ config VIDEO_CX88_ALSA
          To compile this driver as a module, choose M here: the
          module will be called cx88-alsa.
 
+config VIDEO_CX88_BLACKBIRD
+       tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"
+       depends on VIDEO_CX88
+       select VIDEO_CX2341X
+       ---help---
+         This adds support for MPEG encoder cards based on the
+         Blackbird reference design, using the Conexant 2388x
+         and 23416 chips.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cx88-blackbird.
+
 config VIDEO_CX88_DVB
        tristate "DVB/ATSC Support for cx2388x based TV cards"
        depends on VIDEO_CX88 && DVB_CORE
        select VIDEO_BUF_DVB
        ---help---
          This adds support for DVB/ATSC cards based on the
-         Connexant 2388x chip.
+         Conexant 2388x chip.
 
          To compile this driver as a module, choose M here: the
          module will be called cx88-dvb.
@@ -61,6 +73,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_LGDT330X
        select DVB_NXT200X
        select DVB_CX24123
+       select DVB_ISL6421
        ---help---
          This builds cx88-dvb with all currently supported frontend
          demodulators.  If you wish to tweak your configuration, and
@@ -139,6 +152,7 @@ config VIDEO_CX88_DVB_CX24123
        default y
        depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
        select DVB_CX24123
+       select DVB_ISL6421
        ---help---
          This adds DVB-S support for cards based on the
          Connexant 2388x chip and the CX24123 demodulator.