diff options
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.h')
-rw-r--r-- | drivers/video/matrox/matroxfb_base.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index 95883236c0cd..ba64f5e33467 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h | |||
@@ -524,7 +524,6 @@ struct matrox_fb_info { | |||
524 | 524 | ||
525 | #define info2minfo(info) container_of(info, struct matrox_fb_info, fbcon) | 525 | #define info2minfo(info) container_of(info, struct matrox_fb_info, fbcon) |
526 | 526 | ||
527 | #ifdef CONFIG_FB_MATROX_MULTIHEAD | ||
528 | #define ACCESS_FBINFO2(info, x) (info->x) | 527 | #define ACCESS_FBINFO2(info, x) (info->x) |
529 | #define ACCESS_FBINFO(x) ACCESS_FBINFO2(minfo,x) | 528 | #define ACCESS_FBINFO(x) ACCESS_FBINFO2(minfo,x) |
530 | 529 | ||
@@ -538,25 +537,6 @@ struct matrox_fb_info { | |||
538 | #define PMINFO PMINFO2 , | 537 | #define PMINFO PMINFO2 , |
539 | 538 | ||
540 | #define MINFO_FROM(x) struct matrox_fb_info* minfo = x | 539 | #define MINFO_FROM(x) struct matrox_fb_info* minfo = x |
541 | #else | ||
542 | |||
543 | extern struct matrox_fb_info matroxfb_global_mxinfo; | ||
544 | |||
545 | #define ACCESS_FBINFO(x) (matroxfb_global_mxinfo.x) | ||
546 | #define ACCESS_FBINFO2(info, x) (matroxfb_global_mxinfo.x) | ||
547 | |||
548 | #define MINFO (&matroxfb_global_mxinfo) | ||
549 | |||
550 | #define WPMINFO2 void | ||
551 | #define WPMINFO | ||
552 | #define CPMINFO2 void | ||
553 | #define CPMINFO | ||
554 | #define PMINFO2 | ||
555 | #define PMINFO | ||
556 | |||
557 | #define MINFO_FROM(x) | ||
558 | |||
559 | #endif | ||
560 | 540 | ||
561 | #define MINFO_FROM_INFO(x) MINFO_FROM(info2minfo(x)) | 541 | #define MINFO_FROM_INFO(x) MINFO_FROM(info2minfo(x)) |
562 | 542 | ||