diff options
| author | Jean Delvare <khali@linux-fr.org> | 2009-09-22 16:47:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 07:39:57 -0700 |
| commit | a690606d1f54845b018d033ac32e91df25cb2680 (patch) | |
| tree | 062674451f9333e8673d43eabca88e8c2e2c3393 /drivers/video/matrox/matroxfb_DAC1064.c | |
| parent | ee5a27497957e55a520788f88536401e7b12bf41 (diff) | |
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>
Diffstat (limited to 'drivers/video/matrox/matroxfb_DAC1064.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_DAC1064.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c index 88466a04bab..f9fa0fd0029 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]); |