projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
drivers
/
video
/
matrox
/
matroxfb_base.h
diff --git
a/drivers/video/matrox/matroxfb_base.h
b/drivers/video/matrox/matroxfb_base.h
index
a8c47ad
..
b717371
100644
(file)
--- a/
drivers/video/matrox/matroxfb_base.h
+++ b/
drivers/video/matrox/matroxfb_base.h
@@
-50,8
+50,6
@@
#include <asm/mtrr.h>
#endif
#include <asm/mtrr.h>
#endif
-#include "../console/fbcon.h"
-
#if defined(CONFIG_PPC_PMAC)
#include <asm/prom.h>
#include <asm/pci-bridge.h>
#if defined(CONFIG_PPC_PMAC)
#include <asm/prom.h>
#include <asm/pci-bridge.h>
@@
-351,8
+349,6
@@
struct matrox_bios {
} output;
};
} output;
};
-extern struct display fb_display[];
-
struct matrox_switch;
struct matroxfb_driver;
struct matroxfb_dh_fb_info;
struct matrox_switch;
struct matroxfb_driver;
struct matroxfb_dh_fb_info;
@@
-676,6
+672,8
@@
void matroxfb_unregister_driver(struct matroxfb_driver* drv);
#define M_SEQ_INDEX 0x1FC4
#define M_SEQ_DATA 0x1FC5
#define M_SEQ_INDEX 0x1FC4
#define M_SEQ_DATA 0x1FC5
+#define M_SEQ1 0x01
+#define M_SEQ1_SCROFF 0x20
#define M_MISC_REG_READ 0x1FCC
#define M_MISC_REG_READ 0x1FCC