From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Dietrich Date: Mon, 06 Sep 2010 14:36:53 +0000 Subject: [PATCH 11/14] drivers/video: Removing undead ifdef Message-Id: <28eb44049d7ab968bd9c820f65595af79dee5688.1283782701.git.qy03fugy@stud.informatik.uni-erlangen.de> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Petr Vandrovec , Andrew Morton , Jean Delvare , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vamos-dev@i4.informatik.uni-erlangen.de 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 --- 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