diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 5 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 5544e1d6a..00ca40a12 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.41 2005/07/04 19:35:05 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.42 2005/07/12 15:44:55 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -30,6 +30,11 @@ #include <linux/file.h> #include <linux/suspend.h> +#define CONFIG_DVB_MT352 1 +#define CONFIG_DVB_CX22702 1 +#define CONFIG_DVB_OR51132 1 +#define CONFIG_DVB_LGDT3302 1 + #include "cx88.h" #include "dvb-pll.h" diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 3959a5714..d6ebaf6b1 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.18 2005/07/04 16:05:50 mkrufky Exp $ + * $Id: saa7134-dvb.c,v 1.19 2005/07/12 15:44:55 mkrufky Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -30,6 +30,9 @@ #include <linux/kthread.h> #include <linux/suspend.h> +#define CONFIG_DVB_MT352 1 +#define CONFIG_DVB_TDA1004X 1 + #include "saa7134-reg.h" #include "saa7134.h" diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 6d01b4d9c..e0fd90097 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-07-12 15:39 mkrufky + * cx88-dvb.c, saa7134-dvb.c: + - Always include dvb frontend code for hybrid cx88 and saa7134 boards. + A previous change breaks hybrid v4l/dvb boards in 2.6.13-rc2-mm2. + This fixes the bug. We will have to figure out + something better in the future. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-12 04:06 mkrufky * lgdt3302.c: Older gcc's can't do that. |