* [PATCH 11/14] drivers/video: Removing undead ifdef [not found] <cover.1283782698.git.qy03fugy@stud.informatik.uni-erlangen.de> @ 2010-09-06 14:36 ` Christian Dietrich 2010-09-07 13:02 ` Jean Delvare 0 siblings, 1 reply; 2+ messages in thread From: Christian Dietrich @ 2010-09-06 14:36 UTC (permalink / raw) To: Petr Vandrovec, Andrew Morton, Jean Delvare, linux-fbdev, linux-kernel Cc: vamos-dev 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; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 11/14] drivers/video: Removing undead ifdef 2010-09-06 14:36 ` [PATCH 11/14] drivers/video: Removing undead ifdef Christian Dietrich @ 2010-09-07 13:02 ` Jean Delvare 0 siblings, 0 replies; 2+ messages in thread From: Jean Delvare @ 2010-09-07 13:02 UTC (permalink / raw) To: Christian Dietrich Cc: Petr Vandrovec, Andrew Morton, linux-fbdev, linux-kernel, vamos-dev 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 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-07 13:02 UTC | newest] Thread overview: 2+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <cover.1283782698.git.qy03fugy@stud.informatik.uni-erlangen.de> 2010-09-06 14:36 ` [PATCH 11/14] drivers/video: Removing undead ifdef Christian Dietrich 2010-09-07 13:02 ` Jean Delvare
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).