summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/Kconfig4
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/Kconfig b/linux/drivers/media/video/cx88/Kconfig
index e2276a20e..ec6201a32 100644
--- a/linux/drivers/media/video/cx88/Kconfig
+++ b/linux/drivers/media/video/cx88/Kconfig
@@ -92,8 +92,8 @@ config VIDEO_CX88_DVB_NXT200X
Connexant 2388x chip and the NXT2002/NXT2004 demodulator.
config VIDEO_CX88_DVB_CX24123
- tristate "Conexant CX24123 DVB-S Support"
- default m
+ bool "Conexant CX24123 DVB-S Support"
+ default y
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_CX24123
---help---
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 292caf1d5..9cb941a2a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-08 20:57 mkrufky
+
+ * linux/drivers/media/video/cx88/Kconfig:
+ - VIDEO_CX88_DVB_CX24123 is boolean, NOT tristate
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-08 20:40 mchehab
* v4l/scripts/gentree.pl: