matroxfb: get rid of CONFIG_FB_MATROX_32MB

CONFIG_FB_MATROX_32MB is always enabled, so there is no point in having
ifdefs all around.  And it is bad practice to use CONFIG_* as a name for
something which is not a Kconfig option.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 88466a04bab2..f9fa0fd00292 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -1080,10 +1080,8 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
 
         DAC1064_restore_1(minfo);
         matroxfb_vgaHWrestore(minfo);
-#ifdef CONFIG_FB_MATROX_32MB
         if (minfo->devflags.support32MB)
                 mga_setr(M_EXTVGA_INDEX, 8, hw->CRTCEXT[8]);
-#endif
         minfo->crtc1.panpos = -1;
         for (i = 0; i < 6; i++)
                 mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]);