[PATCH] Kconfig: swap VIDEO_CX88_ALSA and VIDEO_CX88_DVB

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx88 / Kconfig

diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 76fcb4e995c92d86f14e864f762106aab4ed6e8e..87d79df053363a9c816e38125cac3f88dcf2426e 100644 (file)
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -15,6 +15,21 @@ config VIDEO_CX88
          To compile this driver as a module, choose M here: the
          module will be called cx8800
 
+config VIDEO_CX88_ALSA
+       tristate "ALSA DMA audio support"
+       depends on VIDEO_CX88 && SND && EXPERIMENTAL
+       select SND_PCM
+       ---help---
+         This is a video4linux driver for direct (DMA) audio on
+         Conexant 2388x based TV cards.
+         It only works with boards with function 01 enabled.
+         To check if your board supports, use lspci -n.
+         If supported, you should see 1471:8801 or 1471:8811
+         PCI device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cx88-alsa.
+
 config VIDEO_CX88_DVB
        tristate "DVB/ATSC Support for cx2388x based TV cards"
        depends on VIDEO_CX88 && DVB_CORE
@@ -29,26 +44,12 @@ config VIDEO_CX88_DVB
          You must also select one or more DVB/ATSC demodulators.
          If you are unsure which you need, choose all of them.
 
-config VIDEO_CX88_ALSA
-       tristate "ALSA DMA audio support"
-       depends on VIDEO_CX88 && SND
-       select SND_PCM_OSS
-       ---help---
-         This is a video4linux driver for direct (DMA) audio on
-         Conexant 2388x based TV cards.
-         It only works with boards with function 01 enabled.
-         To check if your board supports, use lspci -n.
-         If supported, you should see 1471:8801 or 1471:8811
-         PCI device.
-
-         To compile this driver as a module, choose M here: the
-         module will be called cx88-alsa.
-
 config VIDEO_CX88_DVB_ALL_FRONTENDS
        bool "Build all supported frontends for cx2388x based TV cards"
        default y
        depends on VIDEO_CX88_DVB
        select DVB_MT352
+       select VIDEO_CX88_VP3054
        select DVB_OR51132
        select DVB_CX22702
        select DVB_LGDT330X
@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352
          This adds DVB-T support for cards based on the
          Connexant 2388x chip and the MT352 demodulator.
 
+config VIDEO_CX88_VP3054
+       tristate "VP-3054 Secondary I2C Bus Support"
+       default m
+       depends on DVB_MT352
+       ---help---
+         This adds DVB-T support for cards based on the
+         Connexant 2388x chip and the MT352 demodulator,
+         which also require support for the VP-3054
+         Secondary I2C bus, such at DNTV Live! DVB-T Pro.
+
 config VIDEO_CX88_DVB_OR51132
        bool "OR51132 ATSC Support"
        default y