public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Johannes Stezenbach <js@linuxtv.org>
To: Michael Krufky <mkrufky@m1k.net>
Cc: Andrew Morton <akpm@osdl.org>,
	Mauro Carvalho Chehab <mchehab@brturbo.com.br>,
	linux-kernel@vger.kernel.org,
	Linux and Kernel Video <video4linux-list@redhat.com>
Subject: Re: [PATCH -rc2-mm2] BUG FIX - v4l broken hybrid dvb inclusion
Date: Wed, 13 Jul 2005 00:36:00 +0200	[thread overview]
Message-ID: <20050712223600.GA30240@linuxtv.org> (raw)
In-Reply-To: <42D3DC5A.3010807@m1k.net>

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

      parent reply	other threads:[~2005-07-12 22:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-12 15:06 [PATCH -rc2-mm2] BUG FIX - v4l broken hybrid dvb inclusion Michael Krufky
2005-07-12 17:07 ` Alexey Dobriyan
2005-07-12 17:19   ` Michael Krufky
2005-07-12 18:18     ` Alexey Dobriyan
2005-07-12 18:24       ` Michael Krufky
2005-07-12 22:36 ` Johannes Stezenbach [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050712223600.GA30240@linuxtv.org \
    --to=js@linuxtv.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@brturbo.com.br \
    --cc=mkrufky@m1k.net \
    --cc=video4linux-list@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox