Re: [PATCH -rc2-mm2] BUG FIX - v4l broken hybrid dvb inclusion

Johannes Stezenbach
2005-07-12T22:35:49Z

Michael Krufky wrote:
> diff -upr linux-2.6.13-rc2-mm2.orig/drivers/media/video/cx88/cx88-dvb.c linux/drivers/media/video/cx88/cx88-dvb.c
> --- linux-2.6.13-rc2-mm2.orig/drivers/media/video/cx88/cx88-dvb.c 2005-07-12 08:56:58.000000000 +0000
> +++ linux/drivers/media/video/cx88/cx88-dvb.c 2005-07-12 09:01:13.000000000 +0000
> @@ -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 -upr linux-2.6.13-rc2-mm2.orig/drivers/media/video/saa7134/saa7134-dvb.c linux/drivers/media/video/saa7134/saa7134-dvb.c
> --- linux-2.6.13-rc2-mm2.orig/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-12 08:56:59.000000000 +0000
> +++ linux/drivers/media/video/saa7134/saa7134-dvb.c 2005-07-12 09:01:55.000000000 +0000
> @@ -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"
>

A better fix would be to remove the #ifdefs which use this defines.
They are now pointless as Kconfig selects those DVB frontends. As
Gerd Knorr pointed out they were originally introduced as a
workaround because the DVB maintainer was too slow merging
sending patches which the saa7134-dvb.c and cx88-dvb.c
drivers depended on.

Johannes