linux-kernel - Re: [PATCH 11/14] drivers/video: Removing undead ifdef CONFIG_FB_MATROX

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 7 Sep 2010 15:02:38 +0200
From:	Jean Delvare <khali@...ux-fr.org>
To:	Christian Dietrich <qy03fugy@...d.informatik.uni-erlangen.de>
Cc:	Petr Vandrovec <vandrove@...cvut.cz>,
	Andrew Morton <akpm@...ux-foundation.org>,
	linux-fbdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	vamos-dev@...informatik.uni-erlangen.de
Subject: Re: [PATCH 11/14] drivers/video: Removing undead ifdef 
 CONFIG_FB_MATROX_G

On Mon, 6 Sep 2010 16:36:53 +0200, Christian Dietrich wrote:
> The CONFIG_FB_MATROX_G ifdef isn't necessary at this point, because it
> is checked in an outer ifdef level already and has no effect here.
> 
> Signed-off-by: Christian Dietrich <qy03fugy@...d.informatik.uni-erlangen.de>
> ---
>  drivers/video/matrox/matroxfb_DAC1064.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
> index f9fa0fd..1717623 100644
> --- a/drivers/video/matrox/matroxfb_DAC1064.c
> +++ b/drivers/video/matrox/matroxfb_DAC1064.c
> @@ -869,12 +869,9 @@ static int MGAG100_preinit(struct matrox_fb_info *minfo)
>  	minfo->capable.plnwt = minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG100
>  			? minfo->devflags.sgram : 1;
>  
> -#ifdef CONFIG_FB_MATROX_G
>  	if (minfo->devflags.g450dac) {
>  		minfo->outputs[0].output = &g450out;
> -	} else
> -#endif
> -	{
> +	} else {
>  		minfo->outputs[0].output = &m1064;
>  	}
>  	minfo->outputs[0].src = minfo->outputs[0].default_src;

Indeed.

Acked-by: Jean Delvare <khali@...ux-fr.org>

-- 
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/