Pull pnpacpi into release branch

[sfrench/cifs-2.6.git] / drivers / media / video / cx88 / Kconfig

diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index e99dfbbf3e95b8b46f62c260a63f9fd8b57a9b22..630273992a419b05986bd00a462366db212709f4 100644 (file)
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -1,3 +1,7 @@
+config VIDEO_CX88_VP3054
+       tristate
+       depends on VIDEO_CX88_DVB && DVB_MT352
+
 config VIDEO_CX88
        tristate "Conexant 2388x (bt878 successor) support"
        depends on VIDEO_DEV && PCI && I2C
@@ -15,6 +19,22 @@ config VIDEO_CX88
          To compile this driver as a module, choose M here: the
          module will be called cx8800
 
+config VIDEO_CX88_ALSA
+       tristate "Conexant 2388x 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 using ALSA.
+
+         It only works with boards with function 01 enabled.
+         To check if your board supports, use lspci -n.
+         If supported, you should see 14f1:8801 or 14f1: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,27 +49,13 @@ 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 && 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_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_ZL10353
        select DVB_OR51132
        select DVB_CX22702
        select DVB_LGDT330X
@@ -71,16 +77,27 @@ 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
+config VIDEO_CX88_DVB_VP3054
+       bool "VP-3054 Secondary I2C Bus Support"
+       default y
+       depends on VIDEO_CX88_DVB_MT352
+       select VIDEO_CX88_VP3054
        ---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_ZL10353
+       bool "Zarlink ZL10353 DVB-T Support"
+       default y
+       depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
+       select DVB_ZL10353
+       ---help---
+         This adds DVB-T support for cards based on the
+         Connexant 2388x chip and the ZL10353 demodulator,
+         successor to the Zarlink MT352.
+
 config VIDEO_CX88_DVB_OR51132
        bool "OR51132 ATSC Support"
        default y