summaryrefslogtreecommitdiff
path: root/drivers/video/matrox/matroxfb_base.h
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-09-23 03:47:50 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 18:39:57 +0400
commita690606d1f54845b018d033ac32e91df25cb2680 (patch)
tree062674451f9333e8673d43eabca88e8c2e2c3393 /drivers/video/matrox/matroxfb_base.h
parentee5a27497957e55a520788f88536401e7b12bf41 (diff)
downloadlinux-a690606d1f54845b018d033ac32e91df25cb2680.tar.xz
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_base.h')
-rw-r--r--drivers/video/matrox/matroxfb_base.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index 06158ab68cc4..f3a4e15672d9 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -54,9 +54,6 @@
#include "../macmodes.h"
#endif
-/* always compile support for 32MB... It cost almost nothing */
-#define CONFIG_FB_MATROX_32MB
-
#ifdef MATROXFB_DEBUG
#define DEBUG
@@ -464,9 +461,7 @@ struct matrox_fb_info {
int nopciretry;
int noinit;
int sgram;
-#ifdef CONFIG_FB_MATROX_32MB
int support32MB;
-#endif
int accelerator;
int text_type_aux;