Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09b599dd authored by Christian Dietrich's avatar Christian Dietrich Committed by Linus Torvalds
Browse files

drivers/video/matrox/matroxfb_DAC1064.c: remove undead ifdef CONFIG_FB_MATROX_G 



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: default avatarChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 72b4379e

drivers/video/matrox/matroxfb_DAC1064.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -869,12 +869,9 @@ static int MGAG100_preinit(struct matrox_fb_info *minfo) 
	minfo->capable.plnwt = minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG100

	minfo->capable.plnwt = minfo->devflags.accelerator == FB_ACCEL_MATROX_MGAG100

			? minfo->devflags.sgram : 1;

			? minfo->devflags.sgram : 1;





#ifdef CONFIG_FB_MATROX_G

	if (minfo->devflags.g450dac) {

	if (minfo->devflags.g450dac) {

		minfo->outputs[0].output = &g450out;

		minfo->outputs[0].output = &g450out;

	} else

	} else {

#endif

	{

		minfo->outputs[0].output = &m1064;

		minfo->outputs[0].output = &m1064;

	}

	}

	minfo->outputs[0].src = minfo->outputs[0].default_src;

	minfo->outputs[0].src = minfo->outputs[0].default_src;