Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 36 insertions, 0 deletions

diff --git a/drivers/video/matrox/matroxfb_crtc2.h b/drivers/video/matrox/matroxfb_crtc2.h
new file mode 100644
index 000000000000..608e40bb20e9
--- /dev/null
+++ b/drivers/video/matrox/matroxfb_crtc2.h
@@ -0,0 +1,36 @@
+#ifndef __MATROXFB_CRTC2_H__
+#define __MATROXFB_CRTC2_H__
+
+#include <linux/ioctl.h>
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include "matroxfb_base.h"
+
+struct matroxfb_dh_fb_info {
+        struct fb_info          fbcon;
+        int                     fbcon_registered;
+        int                     initialized;
+
+        struct matrox_fb_info*  primary_dev;
+
+        struct {
+                unsigned long   base;   /* physical */
+                vaddr_t         vbase;  /* virtual */
+                unsigned int    len;
+                unsigned int    len_usable;
+                unsigned int    len_maximum;
+                unsigned int    offbase;
+                unsigned int    borrowed;
+                              } video;
+        struct {
+                unsigned long   base;
+                vaddr_t         vbase;
+                unsigned int    len;
+                              } mmio;
+
+        unsigned int            interlaced:1;
+
+        u_int32_t cmap[17];
+};
+
+#endif /* __MATROXFB_CRTC2_H__ */