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: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
72b4379e95
Коммит
09b599ddd4
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче