lkml.org 
[lkml]   [2010]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@stud.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@linux-fr.org>

--
Jean Delvare


\
 
 \ /
  Last update: 2010-09-07 15:05    [W:0.036 / U:39.824 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site