diff options
| author | Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> | 2010-10-27 15:33:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 18:03:07 -0700 |
| commit | 09b599ddd467911ad6b43f3abe3c533446662417 (patch) | |
| tree | 75de5f4753eab28ca1fbc06b79e33042e2dea4ce /drivers/video/matrox | |
| parent | 72b4379e9502e7bf64256af83a55f90bd13d1ce6 (diff) | |
| download | blackbird-op-linux-09b599ddd467911ad6b43f3abe3c533446662417.tar.gz blackbird-op-linux-09b599ddd467911ad6b43f3abe3c533446662417.zip | |
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>
Diffstat (limited to 'drivers/video/matrox')
| -rw-r--r-- | 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 f9fa0fd00292..1717623aabc0 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; |
