Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 87d79df05336..e140996e6ee4 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -50,6 +50,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS
         depends on VIDEO_CX88_DVB
         select DVB_MT352
         select VIDEO_CX88_VP3054
+        select DVB_ZL10353
         select DVB_OR51132
         select DVB_CX22702
         select DVB_LGDT330X
@@ -81,6 +82,16 @@ config VIDEO_CX88_VP3054
           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