From dab08dccae05a0cbdb93b15a6f8532df12650fd1 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Mon, 22 Sep 2008 01:45:01 -0300
Subject: [PATCH] --- yaml --- r: 113982 b: refs/heads/master c:
 5bacea3b9db1b88eeae5427f41efe65138f056da h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/Documentation/video4linux/CARDLIST.cx88 | 2 ++
 trunk/drivers/media/video/cx88/Kconfig        | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e8952a3399b5..c09e4af77bd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee73042c002b435cc8bc49414d466cc3f31af123
+refs/heads/master: 5bacea3b9db1b88eeae5427f41efe65138f056da
diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88
index b51485c16312..8fea29754107 100644
--- a/trunk/Documentation/video4linux/CARDLIST.cx88
+++ b/trunk/Documentation/video4linux/CARDLIST.cx88
@@ -69,3 +69,5 @@
  68 -> Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid           [0070:6900,0070:6904,0070:6902]
  69 -> Hauppauge WinTV-HVR4000(Lite) DVB-S/S2              [0070:6905,0070:6906]
  70 -> TeVii S460 DVB-S/S2                                 [D460:9022]
+ 71 -> Omicom SS4 DVB-S/S2 PCI                             [A044:2011]
+ 72 -> TBS 8920 DVB-S/S2                                   [8920:8888]
diff --git a/trunk/drivers/media/video/cx88/Kconfig b/trunk/drivers/media/video/cx88/Kconfig
index 9dd7bdf659b9..4f65ce3088bf 100644
--- a/trunk/drivers/media/video/cx88/Kconfig
+++ b/trunk/drivers/media/video/cx88/Kconfig
@@ -58,6 +58,7 @@ config VIDEO_CX88_DVB
 	select DVB_ISL6421 if !DVB_FE_CUSTOMISE
 	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
 	select DVB_S5H1411 if !DVB_FE_CUSTOMISE
+	select DVB_CX24116 if !DVB_FE_CUSTOMISE
 	---help---
 	  This adds support for DVB/ATSC cards based on the
 	  Conexant 2388x chip.