diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-09-22 19:47:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:57 -0400 |
commit | a690606d1f54845b018d033ac32e91df25cb2680 (patch) | |
tree | 062674451f9333e8673d43eabca88e8c2e2c3393 /drivers/video/matrox/matroxfb_base.h | |
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_base.h')
-rw-r--r-- | drivers/video/matrox/matroxfb_base.h | 5 |
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 @@ | |||
54 | #include "../macmodes.h" | 54 | #include "../macmodes.h" |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | /* always compile support for 32MB... It cost almost nothing */ | ||
58 | #define CONFIG_FB_MATROX_32MB | ||
59 | |||
60 | #ifdef MATROXFB_DEBUG | 57 | #ifdef MATROXFB_DEBUG |
61 | 58 | ||
62 | #define DEBUG | 59 | #define DEBUG |
@@ -464,9 +461,7 @@ struct matrox_fb_info { | |||
464 | int nopciretry; | 461 | int nopciretry; |
465 | int noinit; | 462 | int noinit; |
466 | int sgram; | 463 | int sgram; |
467 | #ifdef CONFIG_FB_MATROX_32MB | ||
468 | int support32MB; | 464 | int support32MB; |
469 | #endif | ||
470 | 465 | ||
471 | int accelerator; | 466 | int accelerator; |
472 | int text_type_aux; | 467 | int text_type_aux; |