From: "Antonino A. Daplas" <adaplas@gmail.com>

matroxfb has no need for struct display and fbcon.h.  Remove.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/video/matrox/matroxfb_base.h |    4 ----
 1 files changed, 4 deletions(-)

diff -puN drivers/video/matrox/matroxfb_base.h~matroxfb-remove-fbconh-from-the-main-header-file drivers/video/matrox/matroxfb_base.h
--- devel/drivers/video/matrox/matroxfb_base.h~matroxfb-remove-fbconh-from-the-main-header-file	2005-11-21 23:34:44.000000000 -0800
+++ devel-akpm/drivers/video/matrox/matroxfb_base.h	2005-11-21 23:34:44.000000000 -0800
@@ -50,8 +50,6 @@
 #include <asm/mtrr.h>
 #endif
 
-#include "../console/fbcon.h"
-
 #if defined(CONFIG_PPC_PMAC)
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
@@ -351,8 +349,6 @@ struct matrox_bios {
 		      } output;
 };
 
-extern struct display fb_display[];
-
 struct matrox_switch;
 struct matroxfb_driver;
 struct matroxfb_dh_fb_info;
_