summaryrefslogtreecommitdiff
path: root/drivers/video/matrox
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-01-10 04:52:58 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 16:01:43 (GMT)
commitf3e21169b84a80b35d81a2b9fd97eb0b7d73d3f9 (patch)
tree6e325cb0150f434924cb93a2a55fdb761f15fd61 /drivers/video/matrox
parent04a2fe574ad10156266fcdb50adf30ebedad76fb (diff)
downloadlinux-f3e21169b84a80b35d81a2b9fd97eb0b7d73d3f9.tar.xz
[PATCH] matroxfb: Remove fbcon.h from the main header file
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> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/matrox')
-rw-r--r--drivers/video/matrox/matroxfb_base.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index a8c47ad..3a3e180 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -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;