From 59e446936a3a1f5c54d6d43ee4e0248a602f0aeb Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 27 Oct 2010 15:33:23 -0700 Subject: [PATCH] --- yaml --- r: 218514 b: refs/heads/master c: 09b599ddd467911ad6b43f3abe3c533446662417 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/matrox/matroxfb_DAC1064.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 63385b97b782..732bdba74bfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72b4379e9502e7bf64256af83a55f90bd13d1ce6 +refs/heads/master: 09b599ddd467911ad6b43f3abe3c533446662417 diff --git a/trunk/drivers/video/matrox/matroxfb_DAC1064.c b/trunk/drivers/video/matrox/matroxfb_DAC1064.c index f9fa0fd00292..1717623aabc0 100644 --- a/trunk/drivers/video/matrox/matroxfb_DAC1064.c +++ b/trunk/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;